remember to save before committing kids

Author: MysteryPig

Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/Drivetrain.java

@@ -232,15 +232,13 @@ public void shiftGears(boolean highGear) {
 	public void shiftGearSolenoidOff() {
 		dtGear.set(DoubleSolenoid.Value.kOff);
 	}
-<<<<<<< HEAD
 	/**
 	 * Returns the gyroscope
 	 * @return the gyroscope
 	 */
 	public AHRS getGyro() {
 		return fancyGyro;
-=======
-
+	}
 	/**
 	 * Reset the kf constants for both VelocityPIDControllers based on current DT
 	 * gearing (high or low gear).
@@ -270,6 +268,5 @@ public double getCurrentMaxSpeed() {
 		} else {
 			return Robot.getConst("Max Low Speed", 84);
 		}
->>>>>>> upstream/master
 	}
 }