diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-11-08 17:25:26 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-11-08 17:25:26 -0600 |
| commit | fc11078cef11edc9deedd08c6175fb5e6628504c (patch) | |
| tree | 62823b5dc1335a4d8659104dc4156713674ce757 /graphics/contest | |
| parent | ba06c424c974f18f9c4af85eb0ffe8adc6056941 (diff) | |
| parent | 8832b766facd48c85c1b99ac6dad555f1e2aa1c7 (diff) | |
fix merge conflicts
Diffstat (limited to 'graphics/contest')
| -rw-r--r-- | graphics/contest/judge.pal | 19 | ||||
| -rw-r--r-- | graphics/contest/judge_symbols.pal | 19 | ||||
| -rw-r--r-- | graphics/contest/nextturn.pal | 19 |
3 files changed, 0 insertions, 57 deletions
diff --git a/graphics/contest/judge.pal b/graphics/contest/judge.pal deleted file mode 100644 index e62f2abd3..000000000 --- a/graphics/contest/judge.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -156 197 164 -255 222 205 -222 180 148 -172 115 90 -238 238 238 -90 57 57 -57 49 65 -0 0 0 -82 90 8 -57 65 16 -222 82 82 -246 197 49 -246 230 139 -131 131 148 -164 164 180 -205 205 222 diff --git a/graphics/contest/judge_symbols.pal b/graphics/contest/judge_symbols.pal deleted file mode 100644 index 3eeaa1128..000000000 --- a/graphics/contest/judge_symbols.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -205 148 115 -255 106 115 -255 57 57 -156 0 0 -164 222 255 -106 148 255 -49 82 255 -255 255 115 -246 222 65 -230 106 0 -255 255 255 -189 189 197 -131 131 139 -98 98 123 -65 74 106 -41 49 90 diff --git a/graphics/contest/nextturn.pal b/graphics/contest/nextturn.pal deleted file mode 100644 index 05991c79e..000000000 --- a/graphics/contest/nextturn.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -148 90 16 -246 189 115 -255 222 115 -255 255 156 -255 49 24 -213 16 0 -246 156 222 -255 0 90 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 |