From 36e8a7888b58015397d820ae79a8b175e12ccf66 Mon Sep 17 00:00:00 2001
From: jcchurch13 <jcchurch@mit.edu>
Date: Mon, 28 Nov 2016 23:36:52 -0500
Subject: [PATCH] cleaned up after merge

---
 Mechaduino_01/Mechaduino_01/Mechaduino_01.ino | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/Mechaduino_01/Mechaduino_01/Mechaduino_01.ino b/Mechaduino_01/Mechaduino_01/Mechaduino_01.ino
index 8828c82..5030480 100644
--- 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();