fix conflicts

[3501/2015-FRC-Spark] / src / org / usfirst / frc3501 / RiceCatRobot / robot / OI.java

diff --git a/src/org/usfirst/frc3501/RiceCatRobot/robot/OI.java b/src/org/usfirst/frc3501/RiceCatRobot/robot/OI.java
index 6bebe5445fcff4c3ac02fce576614f2f1a109c44..9c391da8b03d72748a7ae832f7e63c107121c63a 100644 (file)
--- a/src/org/usfirst/frc3501/RiceCatRobot/robot/OI.java
+++ b/src/org/usfirst/frc3501/RiceCatRobot/robot/OI.java
@@ -7,25 +7,25 @@ import edu.wpi.first.wpilibj.Joystick;
 import edu.wpi.first.wpilibj.buttons.JoystickButton;
 
 public class OI {
-    public static Joystick leftJoystick;
-    public static Joystick rightJoystick;
-    public static JoystickButton trigger;
-    public static JoystickButton toggleCompressor;
-    public static JoystickButton toggleClaw;
+  public static Joystick leftJoystick;
+  public static Joystick rightJoystick;
+  public static JoystickButton trigger;
+  public static JoystickButton toggleCompressor;
+  public static JoystickButton toggleClaw;
 
-    public OI() {
-        System.out.println("OI is open");
-        leftJoystick = new Joystick(RobotMap.LEFT_STICK_PORT);
-        rightJoystick = new Joystick(RobotMap.RIGHT_STICK_PORT);
+  public OI() {
+    System.out.println("OI is open");
+    leftJoystick = new Joystick(RobotMap.LEFT_STICK_PORT);
+    rightJoystick = new Joystick(RobotMap.RIGHT_STICK_PORT);
 
-        trigger = new JoystickButton(rightJoystick, RobotMap.TRIGGER_PORT);
+    trigger = new JoystickButton(rightJoystick, RobotMap.TRIGGER_PORT);
 
-        toggleClaw = new JoystickButton(rightJoystick, RobotMap.TOGGLE_PORT);
-        toggleClaw.whenPressed(new ToggleClaw());
+    toggleClaw = new JoystickButton(rightJoystick, RobotMap.TOGGLE_PORT);
+    toggleClaw.whenPressed(new ToggleClaw());
 
-        toggleCompressor = new JoystickButton(rightJoystick,
-                RobotMap.TOGGLE_COMPRESSOR_PORT);
-        toggleCompressor.whenPressed(new ToggleCompressor());
+    toggleCompressor = new JoystickButton(rightJoystick,
+        RobotMap.TOGGLE_COMPRESSOR_PORT);
+    toggleCompressor.whenPressed(new ToggleCompressor());
 
-    }
+  }
 }