X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2Fsubsystems%2FDriveTrain.java;fp=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2Fsubsystems%2FDriveTrain.java;h=633b12b4f78298ff07c348f08837ccf55010b9a7;hb=4c032740dfb6f11ba2ee0292b345d333bd954f8c;hp=62edcd1d9ad9530566e555762c7d4b885b98020f;hpb=a9b3e941a6a4a56eef7b04e9873856e7b05c694a;p=3501%2F2017steamworks

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
index 62edcd1..633b12b 100644
--- a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
@@ -95,13 +95,10 @@ public class DriveTrain extends Subsystem {
     return this.driveController;
   }
 
-<<<<<<< HEAD
   public PIDController getGyroController() {
     return this.gyroController;
   }
 
-=======
->>>>>>> move pidcontroller into drivetrain
   public static DriveTrain getDriveTrain() {
     if (driveTrain == null) {
       driveTrain = new DriveTrain();