Fix merge conflicts

This commit is contained in:
Tetrable committed 2019-01-03 02:28:18 +00:00
commit 30e7ac0dca
31 files changed
+11632 -17985

No files matched your search

+1
View File
@@ -9,6 +9,7 @@
#define FRONTIER_FACILITY_FACTORY 4
#define FRONTIER_FACILITY_PIKE 5
#define FRONTIER_FACILITY_PYRAMID 6
#define NUM_FRONTIER_FACILITIES 7
#define TENT_VERDANTURF 2
#define TENT_FALLARBOR 3