projects / 3501 / 2015-FRC-Spark / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fix conflicts
[3501/2015-FRC-Spark] / src / org / usfirst / frc3501 / RiceCatRobot / subsystems / Claw.java
diff --git a/src/org/usfirst/frc3501/RiceCatRobot/subsystems/Claw.java b/src/org/usfirst/frc3501/RiceCatRobot/subsystems/Claw.java
index b7a1f048ab4d1e1f50bebbad19ac4b4e8117d2df..f3db1b5167a9f3aba6faa5ab3fba2a4386a665f8 100644 (file)
--- a/src/org/usfirst/frc3501/RiceCatRobot/subsystems/Claw.java
+++ b/src/org/usfirst/frc3501/RiceCatRobot/subsystems/Claw.java
@@ -1,10 +1,10 @@
 package org.usfirst.frc3501.RiceCatRobot.subsystems;
 
-import org.usfirst.frc3501.RiceCatRobot.OI;
-import org.usfirst.frc3501.RiceCatRobot.Robot;
-import org.usfirst.frc3501.RiceCatRobot.RobotMap;
 import org.usfirst.frc3501.RiceCatRobot.commands.CloseClaw;
 import org.usfirst.frc3501.RiceCatRobot.commands.OpenClaw;
+import org.usfirst.frc3501.RiceCatRobot.robot.OI;
+import org.usfirst.frc3501.RiceCatRobot.robot.Robot;
+import org.usfirst.frc3501.RiceCatRobot.robot.RobotMap;
 
 import edu.wpi.first.wpilibj.DoubleSolenoid;
 import edu.wpi.first.wpilibj.command.Subsystem;