JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

resolve git conflict

Browse Source
This commit is contained in:
Sam Hatchett
2015-09-15 10:46:06 -04:00
parent c9839c0eb3
commit 7336d7a69d
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/epanet2.h
View File

@@ -274,8 +274,4 @@ extern "C" {
} }
#endif #endif
<<<<<<< HEAD
#endif //TOOLKIT_H
=======
#endif //EPANET2_H #endif //EPANET2_H
>>>>>>> coordinates-getter