Fixed conflict :|

diff --git a/src/gameplay.cpp b/src/gameplay.cpp
index a4fec884f580a4a08d9701d202b108643ec7648d..a3f71ff3c9e09f42aa8cbc0ed02b34719ac012d7 100644 (file)
--- a/src/gameplay.cpp
+++ b/src/gameplay.cpp
@@ -76,11 +76,8 @@ void initEverything(void){
        playerSpawnHill=new World();
        
        playerSpawnHill->setBackground(BG_FOREST);
-<<<<<<< Updated upstream
        playerSpawnHill->generateFunc(1280,playerSpawnHillFunc);
-       //playerSpawnHill->generate(1920);
-=======
->>>>>>> Stashed changes
+
 
        /*
         *      Setup the current world, making the player initially spawn in `test`.