From 4c032740dfb6f11ba2ee0292b345d333bd954f8c Mon Sep 17 00:00:00 2001
From: EvanYap <evanyap.14@gmail.com>
Date: Sat, 4 Feb 2017 13:33:06 -0800
Subject: [PATCH] input correct constructor

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

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