From: Arunima DIvya <adivya822@student.fuhsd.org>
Date: Tue, 31 Jan 2017 03:20:45 +0000 (-0800)
Subject: Fix rebase conflicts, by delete shifter instance
X-Git-Url: http://challenge-bot.com/repos/?p=3501%2F2017steamworks;a=commitdiff_plain;h=a4e99721c66bf58635eae0a089ddb26c1c237c07

Fix rebase conflicts, by delete shifter instance
---

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
index ef40903..bf29438 100644
--- a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
@@ -68,6 +68,10 @@ public class DriveTrain extends Subsystem {
         BNO055.vector_type_t.VECTOR_EULER, Port.kOnboard, (byte) 0x28);
     gyroZero = imu.getHeading();
 
+    leftGearPiston = new DoubleSolenoid(Constants.DriveTrain.MODULE_NUMBER,
+        Constants.DriveTrain.LEFT_FORWARD, Constants.DriveTrain.LEFT_REVERSE);
+    rightGearPiston = new DoubleSolenoid(Constants.DriveTrain.MODULE_NUMBER,
+        Constants.DriveTrain.RIGHT_FORWARD, Constants.DriveTrain.RIGHT_REVERSE);
   }
 
   public static DriveTrain getDriveTrain() {