Merge branch 'feature/updateLobbyScreen'

Nick-Pearson · May 6, 2018 · 54534e8 · 54534e8
2 parents 8c834de + 590a3c5
commit 54534e8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/ParkourGame/Content/ThirdPersonCPP/Blueprints/WidgetLobbyScreen.uasset b/ParkourGame/Content/ThirdPersonCPP/Blueprints/WidgetLobbyScreen.uasset
diff --git a/ParkourGame/Content/ThirdPersonCPP/Maps/entryMap.umap b/ParkourGame/Content/ThirdPersonCPP/Maps/entryMap.umap
diff --git a/ParkourGame/Source/ParkourGame/Private/ParkourGame.cpp b/ParkourGame/Source/ParkourGame/Private/ParkourGame.cpp
@@ -31,4 +31,4 @@ class FParkourGame
 	}
 };
 
-IMPLEMENT_PRIMARY_GAME_MODULE(FParkourGame, ParkourGame, "ParkourGame")
+IMPLEMENT_PRIMARY_GAME_MODULE(FParkourGame, ParkourGame, "ParkourGame")
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,4 +31,4 @@ class FParkourGame @@
     	}
     };
-    IMPLEMENT_PRIMARY_GAME_MODULE(FParkourGame, ParkourGame, "ParkourGame")
+    IMPLEMENT_PRIMARY_GAME_MODULE(FParkourGame, ParkourGame, "ParkourGame")