Removed merge lines from git.

snfLOGmgr.hpp

@@ -18,7 +18,6 @@
 #include <ctime>
 #include <cstdio>
 
-<<<<<<< HEAD
 #include "../CodeDweller/timing.hpp"
 
 #ifdef WIN32
@@ -31,8 +30,6 @@
 #include "../CodeDweller/threading.hpp"
 #include "../CodeDweller/histogram.hpp"
 
-=======
->>>>>>> 5ef1aae226f36c766ca1253592a8c11d95dd1992
 #include "snf_match.h"
 
 #include "snfCFGmgr.hpp"