X-Git-Url: http://challenge-bot.com/repos/?p=3501%2Fstronghold-2016;a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2Fsubsystems%2FDriveTrain.java;h=7576e1b08b4bb3c721d956136db5a2b91b574ea3;hp=e19b46f02643a6c24af4d7d261ae9f13fb6c74a8;hb=c688e9da1214ed9257214a0b265a1c1b7eeb1506;hpb=01b9b0ec6d379fdf2d18ecf73d20c1b8298d06c4

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
index e19b46f0..7576e1b0 100644
--- a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
@@ -227,16 +227,10 @@ public class DriveTrain extends PIDSubsystem {
   }
 
   /*
-   * Checks the drive mode <<<<<<< 9728080f491e9fb09795494349dba1297f447c0f
+   * Checks the drive mode
    *
    * @return the current state of the robot in each state Average distance from
    * both sides of tank drive for Encoder Mode Angle from the gyro in GYRO_MODE
-   * =======
-   *
-   * @return the current state of the robot in each state Average distance from
-   * both sides of tank drive for Encoder Mode Angle from the gyro in GYRO_MODE
-   * >>>>>>> Move all constants in DeadReckoning to Auton class because it makes
-   * more sense
    */
   private double sensorFeedback() {
     if (DRIVE_MODE == Constants.DriveTrain.ENCODER_MODE)
@@ -367,7 +361,4 @@ public class DriveTrain extends PIDSubsystem {
     rightGearPiston.set(gear);
   }
 
-  public void toggleTimeDeadReckoning() {
-    Constants.Auton.isUsingTime = !Constants.Auton.isUsingTime;
-  }
 }