From 4dd20c3d051f6e39e5de6c86d04c4cade58fca59 Mon Sep 17 00:00:00 2001 From: Eric Sandoval Date: Sat, 18 Feb 2017 11:33:53 -0800 Subject: [PATCH] fix zeroAngle error --- .../frc/team3501/robot/commands/driving/TurnForAngle.java | 4 ---- 1 file changed, 4 deletions(-) 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(); -- 2.30.2