From: Eric Sandoval <harpnart@gmail.com>
Date: Sat, 4 Feb 2017 23:17:24 +0000 (-0800)
Subject: add seperate pid controllers
X-Git-Url: http://challenge-bot.com/repos/?p=3501%2F2017steamworks;a=commitdiff_plain;h=a734849502d20cda7c35e63848a7b5b752613a79

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 c2e1b6e..2f9d364 100755
--- 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);
   }