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 e868ba3fae425d2eb6dcddb770250342e501de99..c2571ec7174649079463968e204cdae561a25990 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/OI.java
+++ b/src/org/usfirst/frc/team3501/robot/OI.java
@@ -1,14 +1,8 @@
 package org.usfirst.frc.team3501.robot;
 
-<<<<<<< HEAD
 import org.usfirst.frc.team3501.robot.commands.driving.BrakeCANTalons;
 import org.usfirst.frc.team3501.robot.commands.driving.CoastCANTalons;
-=======
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
 
-import org.usfirst.frc.team3501.robot.commands.climber.ToggleWinch;
->>>>>>> Fix ChangeCameraView
 import org.usfirst.frc.team3501.robot.commands.driving.ToggleGear;
 import org.usfirst.frc.team3501.robot.commands.intake.ReverseIntakeContinuous;
 import org.usfirst.frc.team3501.robot.commands.intake.RunIntakeContinuous;
@@ -17,21 +11,14 @@ import org.usfirst.frc.team3501.robot.commands.shooter.IncreaseShootingSpeed;
 import org.usfirst.frc.team3501.robot.commands.shooter.ReverseIndexWheelContinuous;
 import org.usfirst.frc.team3501.robot.commands.shooter.RunFlyWheelContinuous;
 import org.usfirst.frc.team3501.robot.commands.shooter.RunIndexWheelContinuous;
-<<<<<<< HEAD
 import org.usfirst.frc.team3501.robot.commands.shooter.ToggleIndexerPiston;
-=======
->>>>>>> Fix ChangeCameraView
 import org.usfirst.frc.team3501.robot.utils.ChangeCameraView;
 
 import edu.wpi.first.wpilibj.Joystick;
 import edu.wpi.first.wpilibj.buttons.Button;
 import edu.wpi.first.wpilibj.buttons.JoystickButton;
 
-<<<<<<< HEAD
 public class OI /* implements KeyListener */ {
-=======
-public class OI implements KeyListener {
->>>>>>> Fix ChangeCameraView
   private static OI oi;
   public static Joystick leftJoystick;
   public static Joystick rightJoystick;
@@ -111,6 +98,7 @@ public class OI implements KeyListener {
     coastCANTalons = new JoystickButton(rightJoystick,
         Constants.OI.COAST_CANTALONS_PORT);
     coastCANTalons.whenPressed(new CoastCANTalons());
+
   }
 
   public static OI getOI() {
@@ -119,7 +107,6 @@ public class OI implements KeyListener {
     return oi;
   }
 
-<<<<<<< HEAD
   /*
    * @Override public void keyPressed(KeyEvent e) { if (e.getKeyCode() ==
    * KeyEvent.VK_Z) { // Robot.swapCameraFeed();
@@ -131,23 +118,4 @@ public class OI implements KeyListener {
    *
    * @Override public void keyTyped(KeyEvent e) { }
    */
-
-=======
-  @Override
-  public void keyTyped(KeyEvent e) {
-
-  }
-
-  @Override
-  public void keyPressed(KeyEvent e) {
-    // TODO Auto-generated method stub
-
-  }
-
-  @Override
-  public void keyReleased(KeyEvent e) {
-    // TODO Auto-generated method stub
-
-  }
->>>>>>> Fix ChangeCameraView
 }