update code

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 e5e9ff2a760f02e7da62c16ef2502d512729be81..c2e1b6ed5e35db9cf4229c5ef8db3bf79530b6d2 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/commands/driving/TurnForAngle.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/driving/TurnForAngle.java
@@ -37,15 +37,8 @@ public class TurnForAngle extends Command {
     this.zeroAngle = driveTrain.getAngle();
 >>>>>>> fix alot of unnecessary/not used code and init gyroController
 
-<<<<<<< 3921ddf563ce7727724494c62d65c2ca0e8ff8cc
     this.gyroController = Robot.getDriveTrain().getGyroController();
-=======
-    this.gyroP = driveTrain.turnP;
-    this.gyroI = driveTrain.turnI;
-    this.gyroD = driveTrain.turnD;
 
-    this.gyroController = Robot.getDriveTrain().getDriveController();
->>>>>>> update code
     this.gyroController.setDoneRange(1);
     this.gyroController.setMinDoneCycles(5);
   }