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