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