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/berries/apicot | |
| parent | ba06c424c974f18f9c4af85eb0ffe8adc6056941 (diff) | |
| parent | 8832b766facd48c85c1b99ac6dad555f1e2aa1c7 (diff) | |
fix merge conflicts
Diffstat (limited to 'graphics/berries/apicot')
| -rw-r--r-- | graphics/berries/apicot/palette.pal | 19 | ||||
| -rw-r--r-- | graphics/berries/apicot/pic.png | bin | 397 -> 0 bytes |
2 files changed, 0 insertions, 19 deletions
diff --git a/graphics/berries/apicot/palette.pal b/graphics/berries/apicot/palette.pal deleted file mode 100644 index 82cb76d5a..000000000 --- a/graphics/berries/apicot/palette.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -197 197 197 -238 238 255 -189 205 238 -148 180 230 -106 148 222 -65 123 213 -65 98 148 -222 255 131 -197 230 123 -172 213 115 -148 189 106 -123 172 98 -90 131 82 -57 164 156 -255 230 98 -205 164 98 diff --git a/graphics/berries/apicot/pic.png b/graphics/berries/apicot/pic.png Binary files differdeleted file mode 100644 index b7098fc90..000000000 --- a/graphics/berries/apicot/pic.png +++ /dev/null |
