cleaned up after merge

jcchurch13 · Nov 29, 2016 · 36e8a78 · 36e8a78
1 parent 9105d2b
commit 36e8a78
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/Mechaduino_01/Mechaduino_01/Mechaduino_01.ino b/Mechaduino_01/Mechaduino_01/Mechaduino_01.ino
@@ -52,14 +52,7 @@ void setup() {
   digitalWrite(13,HIGH);        //turn LED on 
   setupPins();                  
   setupTCInterrupts();
-<<<<<<< HEAD
-  sineGen(); 
-  stepNumber = 0;  //this fixes a memory bug.... better fix coming soon.
-
 
-=======
-
->>>>>>> refs/remotes/origin/development2
   SerialUSB.begin(115200);
   delay(3000);                  //This delay seems to make it easier to establish a connection when the Mechaduino is configured to start in closed loop mode.  
   serialMenu();