Conflicts resolved in : build/Linux/Makefile build/Linux/Makefile_Rev build/Xcode/epanet.xcodeproj/project.pbxproj include/epanet2.h
Conflicts resolved in : build/Linux/Makefile build/Linux/Makefile_Rev build/Xcode/epanet.xcodeproj/project.pbxproj include/epanet2.h