fix zeroAngle error
authorEric Sandoval <harpnart@gmail.com>
Sat, 18 Feb 2017 19:33:53 +0000 (11:33 -0800)
committerEric Sandoval <harpnart@gmail.com>
Sun, 19 Feb 2017 18:46:49 +0000 (10:46 -0800)
src/org/usfirst/frc/team3501/robot/commands/driving/TurnForAngle.java

index c2e1b6ed5e35db9cf4229c5ef8db3bf79530b6d2..276174d04cfcf1f8d47631b3e078f30b2c571198 100755 (executable)
@@ -32,10 +32,6 @@ public class TurnForAngle extends Command {
     this.direction = direction;
     this.maxTimeOut = maxTimeOut;
     this.target = Math.abs(angle);
-<<<<<<< HEAD
-=======
-    this.zeroAngle = driveTrain.getAngle();
->>>>>>> fix alot of unnecessary/not used code and init gyroController
 
     this.gyroController = Robot.getDriveTrain().getGyroController();