From: EvanYap <evanyap.14@gmail.com>
Date: Sat, 4 Feb 2017 21:23:29 +0000 (-0800)
Subject: move pidcontroller into drivetrain
X-Git-Url: http://challenge-bot.com/repos/?p=3501%2F2017steamworks;a=commitdiff_plain;h=a9b3e941a6a4a56eef7b04e9873856e7b05c694a

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 633b12b..62edcd1 100644
--- 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();