diff options
author | camthesaxman <cameronghall@cox.net> | 2017-11-08 17:25:26 -0600 |
---|---|---|
committer | camthesaxman <cameronghall@cox.net> | 2017-11-08 17:25:26 -0600 |
commit | fc11078cef11edc9deedd08c6175fb5e6628504c (patch) | |
tree | 62823b5dc1335a4d8659104dc4156713674ce757 /graphics/text_window/13.pal | |
parent | ba06c424c974f18f9c4af85eb0ffe8adc6056941 (diff) | |
parent | 8832b766facd48c85c1b99ac6dad555f1e2aa1c7 (diff) |
fix merge conflicts
Diffstat (limited to 'graphics/text_window/13.pal')
-rw-r--r-- | graphics/text_window/13.pal | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/graphics/text_window/13.pal b/graphics/text_window/13.pal deleted file mode 100644 index 59540758f..000000000 --- a/graphics/text_window/13.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -148 148 98 -41 49 49 -180 189 180 -222 213 222 -255 0 255 -255 0 255 -123 115 90 -205 172 115 -238 205 139 -32 74 172 -90 205 213 -74 115 197 -255 0 255 -255 0 255 -255 255 255 -74 65 82 |