From: drumsetmonkey <abelleisle@roadrunner.com>
Date: Wed, 2 Dec 2015 12:30:08 +0000 (-0500)
Subject: Fixed conflict :|
X-Git-Url: https://code.bitgloo.com/?a=commitdiff_plain;h=49b4150f082efd310d7fc5087802713798abaad4;p=clyne%2Fgamedev.git

Fixed conflict :|
---

diff --git a/src/gameplay.cpp b/src/gameplay.cpp
index a4fec88..a3f71ff 100644
--- 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`.