Resolving merge conflicts

2018-08-27 09:38:46 -04:00
parent 40cd25748c c4b7c90634
commit bdc05058ca
26 changed files with 1572 additions and 1059 deletions
--- a/src/input2.c
+++ b/src/input2.c
@@ -37,8 +37,6 @@ The following utility functions are all called from INPUT3.C
 #include "epanet2.h"
 #include "funcs.h"
 #include <math.h>
-#define EXTERN extern
-#include "vars.h"

 #define MAXERRS 10 /* Max. input errors reported        */