Fixed some Merge errors. Also fixed a package name error

Changed the triggers package to be properly packed. Also adjusted OI to compensate
Team708 · Feb 9, 2015 · eead343 · eead343
1 parent af54eb3
commit eead343
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/src/org/team708/robot/OI.java b/src/org/team708/robot/OI.java
@@ -1,22 +1,19 @@
 package org.team708.robot;
 
 
-import org.team708.robot.util.triggers.AxisDown;
-import org.team708.robot.util.triggers.AxisUp;
-
 import org.team708.robot.commands.claw.ToggleClawOpen;
 import org.team708.robot.commands.claw.ToggleWrist;
 import org.team708.robot.commands.clawElevator.DecrementClawOne;
-import org.team708.robot.commands.clawElevator.DecrementOneClawHeight;
 import org.team708.robot.commands.clawElevator.IncrementClawOne;
-import org.team708.robot.commands.clawElevator.IncrementOneClawHeight;
 import org.team708.robot.commands.drivetrain.ToggleBrakeMode;
 import org.team708.robot.commands.hockeyStick.ToggleHockeyStick;
 import org.team708.robot.commands.intake.ToggleDirection;
 import org.team708.robot.commands.intake.TogglePower;
 import org.team708.robot.commands.toteElevator.ToteElevatorDown;
 import org.team708.robot.commands.toteElevator.ToteElevatorUp;
 import org.team708.robot.util.Gamepad;
+import org.team708.robot.util.triggers.AxisDown;
+import org.team708.robot.util.triggers.AxisUp;
 
 import edu.wpi.first.wpilibj.buttons.Button;
 import edu.wpi.first.wpilibj.buttons.JoystickButton;

diff --git a/...team708/robot/util/triggers/AxisDown.java → ...team708/robot/util/triggers/AxisDown.java b/...team708/robot/util/triggers/AxisDown.java → ...team708/robot/util/triggers/AxisDown.java
@@ -1,4 +1,4 @@
-package or.team708.robot.util.triggers;
+package org.team708.robot.util.triggers;
 
 import org.team708.robot.util.Gamepad;
 

diff --git a/...r/team708/robot/util/triggers/AxisUp.java → ...g/team708/robot/util/triggers/AxisUp.java b/...r/team708/robot/util/triggers/AxisUp.java → ...g/team708/robot/util/triggers/AxisUp.java
@@ -1,4 +1,4 @@
-package or.team708.robot.util.triggers;
+package org.team708.robot.util.triggers;
 
 import org.team708.robot.util.Gamepad;