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/rules.c
+++ b/src/rules.c
@@ -29,13 +29,11 @@ AUTHOR:     L. Rossman
 #else
 #include <stdlib.h>
 #endif
-#include "epanet2.h"
+
 #include "funcs.h"
 #include "hash.h"
 #include "text.h"
 #include "types.h"
-#define EXTERN extern
-#include "vars.h"

 enum Rulewords {
  r_RULE,