diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-07-07 16:54:14 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-07-07 16:54:14 -0500 |
| commit | f719abf104e304ed2f886a413d1132a75e3379b1 (patch) | |
| tree | 352be6d36f1db3f697394bc193adb7fa8142be71 /graphics/battle_terrain/building | |
| parent | 2d604191592fbac2618d4a626f61ff1423cac828 (diff) | |
| parent | bd4a6520eaaaac186b6b26557305be8939a7ea2a (diff) | |
fix merge conflicts
Diffstat (limited to 'graphics/battle_terrain/building')
| -rw-r--r--[-rwxr-xr-x] | graphics/battle_terrain/building/palette2.pal | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | graphics/battle_terrain/building/palette3.pal | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/graphics/battle_terrain/building/palette2.pal b/graphics/battle_terrain/building/palette2.pal index 3ca2e0b0c..3ca2e0b0c 100755..100644 --- a/graphics/battle_terrain/building/palette2.pal +++ b/graphics/battle_terrain/building/palette2.pal diff --git a/graphics/battle_terrain/building/palette3.pal b/graphics/battle_terrain/building/palette3.pal index cebf5e687..cebf5e687 100755..100644 --- a/graphics/battle_terrain/building/palette3.pal +++ b/graphics/battle_terrain/building/palette3.pal |