From 7336d7a69d4bde409dc84d4df00a8068f610737a Mon Sep 17 00:00:00 2001
From: Sam Hatchett <samhatchett@gmail.com>
Date: Tue, 15 Sep 2015 10:46:06 -0400
Subject: [PATCH] resolve git conflict

---
 include/epanet2.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/include/epanet2.h b/include/epanet2.h
index e447d85..b2d730c 100755
--- a/include/epanet2.h
+++ b/include/epanet2.h
@@ -274,8 +274,4 @@ extern "C" {
 }
 #endif
 
-<<<<<<< HEAD
-#endif //TOOLKIT_H
-=======
 #endif //EPANET2_H
->>>>>>> coordinates-getter