From eead343e66c2bd5ab9ed2890ba03ecde4ace4ba4 Mon Sep 17 00:00:00 2001
From: Nam Tran <tranngocnam97@yahoo.com>
Date: Sun, 8 Feb 2015 19:29:37 -0500
Subject: [PATCH] Fixed some Merge errors. Also fixed a package name error

Changed the triggers package to be properly packed. Also adjusted OI to
compensate
---
 src/org/team708/robot/OI.java                             | 7 ++-----
 src/{or => org}/team708/robot/util/triggers/AxisDown.java | 2 +-
 src/{or => org}/team708/robot/util/triggers/AxisUp.java   | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)
 rename src/{or => org}/team708/robot/util/triggers/AxisDown.java (91%)
 rename src/{or => org}/team708/robot/util/triggers/AxisUp.java (91%)

diff --git a/src/org/team708/robot/OI.java b/src/org/team708/robot/OI.java
index ff7b0ca..f5a1f53 100644
--- a/src/org/team708/robot/OI.java
+++ b/src/org/team708/robot/OI.java
@@ -1,15 +1,10 @@
 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;
@@ -17,6 +12,8 @@
 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/src/or/team708/robot/util/triggers/AxisDown.java b/src/org/team708/robot/util/triggers/AxisDown.java
similarity index 91%
rename from src/or/team708/robot/util/triggers/AxisDown.java
rename to src/org/team708/robot/util/triggers/AxisDown.java
index 6ce3747..42f8f9d 100644
--- a/src/or/team708/robot/util/triggers/AxisDown.java
+++ b/src/org/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/src/or/team708/robot/util/triggers/AxisUp.java b/src/org/team708/robot/util/triggers/AxisUp.java
similarity index 91%
rename from src/or/team708/robot/util/triggers/AxisUp.java
rename to src/org/team708/robot/util/triggers/AxisUp.java
index 188f65b..4ddfc44 100644
--- a/src/or/team708/robot/util/triggers/AxisUp.java
+++ b/src/org/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;