From: Eric Sandoval <harpnart@gmail.com>
Date: Sat, 18 Feb 2017 19:33:53 +0000 (-0800)
Subject: fix zeroAngle error
X-Git-Url: http://challenge-bot.com/repos/?p=3501%2F2017steamworks;a=commitdiff_plain;h=4dd20c3d051f6e39e5de6c86d04c4cade58fca59

fix zeroAngle error
---

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..276174d 100755
--- 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();