summaryrefslogtreecommitdiff
path: root/graphics/contest/nextturn.pal
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2017-11-08 17:25:26 -0600
committercamthesaxman <cameronghall@cox.net>2017-11-08 17:25:26 -0600
commitfc11078cef11edc9deedd08c6175fb5e6628504c (patch)
tree62823b5dc1335a4d8659104dc4156713674ce757 /graphics/contest/nextturn.pal
parentba06c424c974f18f9c4af85eb0ffe8adc6056941 (diff)
parent8832b766facd48c85c1b99ac6dad555f1e2aa1c7 (diff)
fix merge conflicts
Diffstat (limited to 'graphics/contest/nextturn.pal')
-rw-r--r--graphics/contest/nextturn.pal19
1 files changed, 0 insertions, 19 deletions
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