From e03619c9dd92cf044cc06090af4061bbebd2cb76 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <tullivan99@gmail.com>
Date: Wed, 2 Dec 2015 07:38:27 -0500
Subject: fixed item dialog

---
 src/gameplay.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src/gameplay.cpp')

diff --git a/src/gameplay.cpp b/src/gameplay.cpp
index a4fec88..cc9ae6a 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`.
-- 
cgit v1.2.3