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