From: EvanYap <evanyap.14@gmail.com>
Date: Sat, 4 Feb 2017 23:25:54 +0000 (-0800)
Subject: fix alot of unnecessary/not used code and init gyroController
X-Git-Url: http://challenge-bot.com/repos/?p=3501%2F2017steamworks;a=commitdiff_plain;h=b95024be2a6fa7f3516ed49318c690236f542afb

fix alot of unnecessary/not used code and init gyroController
---

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 2f9d364..c2e1b6e 100755
--- a/src/org/usfirst/frc/team3501/robot/commands/driving/TurnForAngle.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/driving/TurnForAngle.java
@@ -39,10 +39,6 @@ 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);
   }