fix merge conflicts

2018-12-03 16:58:28 -05:00
parent d6a88e0eaa d9a5de5317
commit 2c14d6ee6c
79 changed files with 13401 additions and 11451 deletions
--- a/src/data/battle_frontier/battle_pyramid_level_50_wild_mons.h
+++ b/src/data/battle_frontier/battle_pyramid_level_50_wild_mons.h
@@ -1,4 +1,3 @@
-
 static const struct PyramidWildMon sLevel50WildMons_Round1[] =
 {
    {
--- a/src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h
+++ b/src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h
@@ -1,4 +1,3 @@
-
 static const struct PyramidWildMon sOpenLevelWildMons_Round1[] =
 {
    {