Config/DefaultEngine.ini

@@ -2,6 +2,20 @@
 GameName=TetreeseDemo
 
 [/Script/EngineSettings.GameMapsSettings]
+<<<<<<< HEAD
+EditorStartupMap=/Game/Maps/Map002.Map002
+LocalMapOptions=
+TransitionMap=None
+bUseSplitscreen=True
+TwoPlayerSplitscreenLayout=Horizontal
+ThreePlayerSplitscreenLayout=FavorTop
+FourPlayerSplitscreenLayout=Grid
+bOffsetPlayerGamepadIds=False
+GameInstanceClass=/Script/Engine.GameInstance
+GameDefaultMap=/Game/Maps/Map002.Map002
+ServerDefaultMap=/Engine/Maps/Entry.Entry
+GlobalDefaultGameMode=None
+=======
 EditorStartupMap=/Game/Maps/Map007.Map007
 GameDefaultMap=/Game/Maps/Map007.Map007
 TransitionMap=
@@ -9,6 +23,7 @@ bUseSplitscreen=True
 TwoPlayerSplitscreenLayout=Horizontal
 ThreePlayerSplitscreenLayout=FavorTop
 GlobalDefaultGameMode=/Game/BP/VRGameMode.VRGameMode_C
+>>>>>>> fe3e73ccf9f70de20e6a3d3c86c2ae9cd4a6adf0
 GlobalDefaultServerGameMode=None
 
 [/Script/IOSRuntimeSettings.IOSRuntimeSettings]