Fixes to implement issue #161

2018-06-19 10:30:02 -04:00
parent d5194ffb81
commit e9303de078
6 changed files with 25 additions and 1394 deletions
--- a/src/types.h
+++ b/src/types.h
@@ -50,7 +50,6 @@ 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