aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2015-09-11 20:30:45 -0400
committerClyne Sullivan <tullivan99@gmail.com>2015-09-11 20:30:45 -0400
commit61bd2cfb0bd85c5d169ff994f1840996d39897ab (patch)
tree5e5730d944233213225b5430a792c786cec2252f
parent9e81d6b967d87a163ecb6123eb34b9817fa13454 (diff)
fixed main.cpp
-rw-r--r--src/main.cpp1
1 files changed, 0 insertions, 1 deletions
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;