undid changes

kb1isz · Aug 8, 2014 · 1ffed6f · 1ffed6f
1 parent 3520d1a
commit 1ffed6f
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/main.c b/main.c
@@ -26,13 +26,8 @@ int rdacPort = 50002;
 int baseRdacPort = 50200;
 int maxRepeaters = 20;
 int echoId = 9990;
-<<<<<<< HEAD
-int recordId = 9991;
-char version[5] = "0.9";
-=======
 int rrsGpsId = 500;
 char version[5] = "1.0";
->>>>>>> upstream/master
 
 struct repeater repeaterList[100] = {0};
 struct repeater emptyRepeater = {0};