summaryrefslogtreecommitdiff
path: root/graphics/intro/intro2_manectric.pal
diff options
context:
space:
mode:
authorgolem galvanize <golemgalvanize@github.com>2018-02-07 14:14:08 -0500
committergolem galvanize <golemgalvanize@github.com>2018-02-07 14:14:08 -0500
commitb67afb9490ce7fce8c7d478e9b436c5b849fb4ad (patch)
treeb07bb0bb43aeba2c7cfef97213578fb815ccb266 /graphics/intro/intro2_manectric.pal
parent5f7709dc8bf1bf4eb75d9481e285980f347d5dd7 (diff)
parent802b505d7bc4f60e6dda62c9a2a4948b8ba765df (diff)
I hope this fixes the conflicts
Diffstat (limited to 'graphics/intro/intro2_manectric.pal')
-rw-r--r--graphics/intro/intro2_manectric.pal19
1 files changed, 0 insertions, 19 deletions
diff --git a/graphics/intro/intro2_manectric.pal b/graphics/intro/intro2_manectric.pal
deleted file mode 100644
index c6bf97aa3..000000000
--- a/graphics/intro/intro2_manectric.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-74 189 172
-82 74 74
-139 139 123
-197 189 222
-255 255 255
-230 49 0
-246 148 0
-0 0 0
-255 255 180
-246 246 90
-205 213 49
-148 123 8
-131 164 255
-106 106 255
-41 74 213
-0 0 0