From: Clyne Sullivan <tullivan99@gmail.com>
Date: Sat, 12 Sep 2015 00:30:45 +0000 (-0400)
Subject: fixed main.cpp
X-Git-Url: https://code.bitgloo.com/?a=commitdiff_plain;h=61bd2cfb0bd85c5d169ff994f1840996d39897ab;p=clyne%2Fgamedev.git

fixed main.cpp
---

diff --git a/src/main.cpp b/src/main.cpp
index 3575419..67ba8a6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -109,7 +109,6 @@ int main(int argc,char **argv){
 		fclose(f);
 	}*/
 	irand(time(NULL));
->>>>>>> Stashed changes
 	
 	float gw;