Delete the head from the merge

Author: dayizhang

SingleTactLibrary/ArduinoSingleTactDriver.cs

@@ -64,11 +64,8 @@ public void Initialise(string serialPort)
             Thread.Sleep(10);
             serialPort_.DtrEnable = false;
             Thread.Sleep(2000); //Give Arduino time to boot after reset
-<<<<<<< HEAD
-
             serialPort_.RtsEnable = true;
-=======
->>>>>>> refs/remotes/origin/master
+
         }
 
         public void ResetArduino()