From a9b3e941a6a4a56eef7b04e9873856e7b05c694a Mon Sep 17 00:00:00 2001
From: EvanYap <evanyap.14@gmail.com>
Date: Sat, 4 Feb 2017 13:23:29 -0800
Subject: [PATCH] move pidcontroller into drivetrain

---
 src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java | 3 +++
 1 file changed, 3 insertions(+)

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();
-- 
2.30.2