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 /constants/constants.inc | |
| parent | ba06c424c974f18f9c4af85eb0ffe8adc6056941 (diff) | |
| parent | 8832b766facd48c85c1b99ac6dad555f1e2aa1c7 (diff) | |
fix merge conflicts
Diffstat (limited to 'constants/constants.inc')
| -rw-r--r-- | constants/constants.inc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/constants/constants.inc b/constants/constants.inc index 81d3b72fe..bc55f6723 100644 --- a/constants/constants.inc +++ b/constants/constants.inc @@ -14,7 +14,6 @@ .include "constants/map_constants.inc" .include "constants/berry_constants.inc" .include "constants/map_object_constants.inc" - .include "constants/battle_tower_constants.inc" .include "constants/opponent_constants.inc" .include "constants/decorations.inc" .include "constants/songs.inc" |