From: EvanYap <evanyap.14@gmail.com>
Date: Sat, 4 Feb 2017 21:33:06 +0000 (-0800)
Subject: input correct constructor
X-Git-Url: http://challenge-bot.com/repos/?p=3501%2F2017steamworks;a=commitdiff_plain;h=4c032740dfb6f11ba2ee0292b345d333bd954f8c

input correct constructor
---

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