Merge branch 'contributor-lr' of https://github.com/LRossman/EPANET into contributor-lr

2018-06-16 11:12:59 -04:00
parent 9afb6f0b28 f11308fc72
commit d5194ffb81
1 changed files with 2 additions and 1 deletions
--- a/src/types.h
+++ b/src/types.h
@@ -50,6 +50,7 @@ typedef  int          INT4;
 #define   MAXMSG    79       /* Max. # characters in message text      */
 #define   MAXLINE   255      /* Max. # characters read from input line */
 #define   MAXFNAME  259      /* Max. # characters in file name         */
+>>>>>>> f11308fc72eccc8b74b18d5ddab0eb2ae0d36587
 #define   MAXTOKS   40       /* Max. items per line of input           */
 #define   TZERO     1.E-4    /* Zero time tolerance                    */
 #define   TRUE      1