Fix merge conflicts

[3501/2017steamworks] / src / org / usfirst / frc / team3501 / robot / OI.java

diff --git a/src/org/usfirst/frc/team3501/robot/OI.java b/src/org/usfirst/frc/team3501/robot/OI.java
index c2571ec7174649079463968e204cdae561a25990..16ed17c47527bb4e051eb3e038258fa8bfa4e547 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/OI.java
+++ b/src/org/usfirst/frc/team3501/robot/OI.java
@@ -98,7 +98,6 @@ public class OI /* implements KeyListener */ {
     coastCANTalons = new JoystickButton(rightJoystick,
         Constants.OI.COAST_CANTALONS_PORT);
     coastCANTalons.whenPressed(new CoastCANTalons());
-
   }
 
   public static OI getOI() {