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/5.pal | |
| parent | ba06c424c974f18f9c4af85eb0ffe8adc6056941 (diff) | |
| parent | 8832b766facd48c85c1b99ac6dad555f1e2aa1c7 (diff) | |
fix merge conflicts
Diffstat (limited to 'graphics/text_window/5.pal')
| -rw-r--r-- | graphics/text_window/5.pal | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/graphics/text_window/5.pal b/graphics/text_window/5.pal deleted file mode 100644 index 5d81802e2..000000000 --- a/graphics/text_window/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -148 148 98 -222 213 222 -0 222 255 -123 57 0 -230 123 0 -255 255 41 -0 106 0 -0 172 0 -115 255 41 -139 0 0 -205 49 0 -255 189 0 -0 0 180 -0 106 213 -255 255 255 -74 65 82 |