fix zeroAngle error

[3501/2017steamworks] / src / org / usfirst / frc / team3501 / robot / commands / driving / TurnForAngle.java

diff --git a/src/org/usfirst/frc/team3501/robot/commands/driving/TurnForAngle.java b/src/org/usfirst/frc/team3501/robot/commands/driving/TurnForAngle.java
index c2e1b6ed5e35db9cf4229c5ef8db3bf79530b6d2..276174d04cfcf1f8d47631b3e078f30b2c571198 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/commands/driving/TurnForAngle.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/driving/TurnForAngle.java
@@ -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();