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/unused/basic_frame.pal | |
| parent | ba06c424c974f18f9c4af85eb0ffe8adc6056941 (diff) | |
| parent | 8832b766facd48c85c1b99ac6dad555f1e2aa1c7 (diff) | |
fix merge conflicts
Diffstat (limited to 'graphics/unused/basic_frame.pal')
| -rw-r--r-- | graphics/unused/basic_frame.pal | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/graphics/unused/basic_frame.pal b/graphics/unused/basic_frame.pal deleted file mode 100644 index 70ff9b632..000000000 --- a/graphics/unused/basic_frame.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -106 123 164 -205 205 205 -255 255 255 -164 164 164 -0 0 0 -172 0 0 -222 0 0 -197 74 0 -255 24 0 -205 164 106 -255 222 164 -255 131 0 -255 255 255 -123 238 90 -131 172 246 |