summaryrefslogtreecommitdiff
path: root/graphics/text_window/10.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/text_window/10.pal
parentba06c424c974f18f9c4af85eb0ffe8adc6056941 (diff)
parent8832b766facd48c85c1b99ac6dad555f1e2aa1c7 (diff)
fix merge conflicts
Diffstat (limited to 'graphics/text_window/10.pal')
-rw-r--r--graphics/text_window/10.pal19
1 files changed, 0 insertions, 19 deletions
diff --git a/graphics/text_window/10.pal b/graphics/text_window/10.pal
deleted file mode 100644
index 7ba0c53b6..000000000
--- a/graphics/text_window/10.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-148 148 98
-41 49 49
-255 180 131
-255 49 0
-255 131 82
-205 115 0
-164 123 49
-131 98 24
-172 139 65
-255 164 8
-189 180 123
-222 213 156
-180 189 180
-222 213 222
-255 255 255
-74 65 82