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