resolve git conflict

2015-09-15 10:46:06 -04:00
parent c9839c0eb3
commit 7336d7a69d
1 changed files with 0 additions and 4 deletions
--- a/include/epanet2.h
+++ b/include/epanet2.h
@@ -274,8 +274,4 @@ extern "C" {
 }
 #endif

-<<<<<<< HEAD
-#endif //TOOLKIT_H
-=======
 #endif //EPANET2_H
->>>>>>> coordinates-getter