projects / 3501 / 2017steamworks / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6f28f1e)
fixed a few errors
authorTrevor <tr89on@gmail.com>
Fri, 27 Jan 2017 04:46:35 +0000 (20:46 -0800)
committerTrevor <tr89on@gmail.com>
Tue, 31 Jan 2017 03:13:50 +0000 (19:13 -0800)
src/org/usfirst/frc/team3501/robot/OI.java patch | blob | blame | history

diff --git a/src/org/usfirst/frc/team3501/robot/OI.java b/src/org/usfirst/frc/team3501/robot/OI.java
index d13e151fb9368ed9d2bce7ae8388c64664014486..bf4c6dd3c55a6cd0df39240ac21ce9a8e1a716c4 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/OI.java
+++ b/src/org/usfirst/frc/team3501/robot/OI.java
@@ -1,19 +1,14 @@
 package org.usfirst.frc.team3501.robot;
 
-<<<<<<<HEAD<<<<<<<HEAD
-
 import org.usfirst.frc.team3501.robot.commandgroups.PrepareToShoot;
 import org.usfirst.frc.team3501.robot.commandgroups.Shoot;
 import org.usfirst.frc.team3501.robot.commands.driving.ToggleGear;
 import org.usfirst.frc.team3501.robot.commands.driving.Turn90Left;
 import org.usfirst.frc.team3501.robot.commands.driving.Turn90Right;
 import org.usfirst.frc.team3501.robot.commands.shooter.DecreaseShootingSpeed;
-import org.usfirst.frc.team3501.robot.commands.shooter.IncreaseShootingSpeed;import org.usfirst.frc.team3501.robot.commands.shooter.RunIndexWheelContinuous;=======
-import org.usfirst.frc3501.RiceCatRobot.Constants;
-import org.usfirst.frc3501.RiceCatRobot.commands.CloseClaw;
-import org.usfirst.frc3501.RiceCatRobot.commands.ToggleClaw;import org.usfirst.frc3501.RiceCatRobot.commands.ToggleCompressor;>>>>>>>Added joystick buttons
+import org.usfirst.frc.team3501.robot.commands.shooter.IncreaseShootingSpeed;
+import org.usfirst.frc.team3501.robot.commands.shooter.RunIndexWheelContinuous;
 
-=======>>>>>>>added all the joystick buttons
 import edu.wpi.first.wpilibj.Joystick;
 import edu.wpi.first.wpilibj.buttons.Button;
 import edu.wpi.first.wpilibj.buttons.JoystickButton;