Fix conflict for camera feed

diff --git a/src/org/usfirst/frc/team3501/robot/OI.java b/src/org/usfirst/frc/team3501/robot/OI.java
index 4a0e946bffa1df4e9c7f69d7f69bd4db99980251..e868ba3fae425d2eb6dcddb770250342e501de99 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/OI.java
+++ b/src/org/usfirst/frc/team3501/robot/OI.java
@@ -1,7 +1,14 @@
 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;
@@ -10,14 +17,21 @@ 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;
@@ -105,6 +119,7 @@ public class OI /* implements KeyListener */ {
     return oi;
   }
 
+<<<<<<< HEAD
   /*
    * @Override public void keyPressed(KeyEvent e) { if (e.getKeyCode() ==
    * KeyEvent.VK_Z) { // Robot.swapCameraFeed();
@@ -117,4 +132,22 @@ 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
 }