move pidcontroller into drivetrain

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
index 633b12b4f78298ff07c348f08837ccf55010b9a7..62edcd1d9ad9530566e555762c7d4b885b98020f 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
@@ -95,10 +95,13 @@ 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();