fixed main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 357541902cc4a05e9670229b548e6f1a048257a9..67ba8a6891d0a8557630473ce5693d7abca6ef65 100644 (file)
--- 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;