Remove strange string from types.h and fix win_build make file

2018-06-17 07:48:25 +03:00
parent d5194ffb81
commit 42f70f579f
2 changed files with 5 additions and 5 deletions
--- a/src/types.h
+++ b/src/types.h
@@ -50,7 +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
+//>>>>>>> f11308fc72eccc8b74b18d5ddab0eb2ae0d36587
 #define   MAXTOKS   40       /* Max. items per line of input           */
 #define   TZERO     1.E-4    /* Zero time tolerance                    */
 #define   TRUE      1