diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2018-02-07 20:17:55 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-02-07 20:17:55 +0100 |
commit | 4b7d778a5ce4c2012966bb34b706dadd860804a1 (patch) | |
tree | 59e554a52930bf67ef3c16ea314bfbbdd7f3bdd9 /graphics/intro/intro2_manectric.pal | |
parent | 541fef5368c334559cba946f61ab3fe08bf1575b (diff) | |
parent | 802b505d7bc4f60e6dda62c9a2a4948b8ba765df (diff) |
move mon data fix conflicts
Diffstat (limited to 'graphics/intro/intro2_manectric.pal')
-rw-r--r-- | graphics/intro/intro2_manectric.pal | 19 |
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 |