add seperate pid controllers

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..2f9d36477b3af30137811c4bc63e613c68867043 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/commands/driving/TurnForAngle.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/driving/TurnForAngle.java
@@ -39,6 +39,10 @@ public class TurnForAngle extends Command {
 
     this.gyroController = Robot.getDriveTrain().getGyroController();
 
+<<<<<<< c56ee177a9387e78474e35cbaa7355c443d5ae8a
+=======
+    this.gyroController = Robot.getDriveTrain().getGyroController();
+>>>>>>> add seperate pid controllers
     this.gyroController.setDoneRange(1);
     this.gyroController.setMinDoneCycles(5);
   }