Update page_game.cpp to fix rebase issue

longturn · Jan 29, 2023 · 7e8a585 · 7e8a585
1 parent e565b85
commit 7e8a585
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/client/page_game.cpp b/client/page_game.cpp
@@ -29,11 +29,9 @@
 // client
 #include "client_main.h"
 #include "text.h"
-<<<<<<< HEAD
-#include "views/view_map_common.h"
-=======
 #include "tileset/tilespec.h"
->>>>>>> 4cae8eccde (Fix location of tileset.h that rebase didn't pick up)
+#include "views/view_map_common.h"
+
 // gui-qt - Eye of Storm
 #include "chatline.h"
 #include "citydlg.h"