summaryrefslogtreecommitdiff
path: root/graphics/interface/ball/master.pal
diff options
context:
space:
mode:
authorgolem galvanize <golemgalvanize@github.com>2018-01-09 16:48:01 -0500
committergolem galvanize <golemgalvanize@github.com>2018-01-09 16:48:01 -0500
commitc7722a492017dbd8a5fb3bb216062eb62129daf5 (patch)
tree2a5c0ba6a6b9364aa93eb4a9a89b35153954ab63 /graphics/interface/ball/master.pal
parent2d141bc612ffecc984f6b4238c2791ba8419a192 (diff)
parent85174ad6193d3d58b92deaaedf8c510440ed85ee (diff)
fixing merge conflicts
Diffstat (limited to 'graphics/interface/ball/master.pal')
-rw-r--r--graphics/interface/ball/master.pal19
1 files changed, 0 insertions, 19 deletions
diff --git a/graphics/interface/ball/master.pal b/graphics/interface/ball/master.pal
deleted file mode 100644
index 72247849b..000000000
--- a/graphics/interface/ball/master.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-255 255 255
-115 16 156
-139 41 172
-164 65 189
-189 90 205
-255 255 255
-148 148 148
-65 65 65
-24 24 24
-255 98 139
-255 148 172
-255 197 213
-255 255 255
-255 255 255
-255 255 255
-255 255 255