fix conflicts

[3501/2015-FRC-Spark] / src / org / usfirst / frc3501 / RiceCatRobot / commands / ToggleClaw.java

diff --git a/src/org/usfirst/frc3501/RiceCatRobot/commands/ToggleClaw.java b/src/org/usfirst/frc3501/RiceCatRobot/commands/ToggleClaw.java
index 32f658f86b7a092ffcdf4aacf0e0300062024f78..c85ea77d46b5155a66628a2bc9eed17ca6be2aba 100644 (file)
--- a/src/org/usfirst/frc3501/RiceCatRobot/commands/ToggleClaw.java
+++ b/src/org/usfirst/frc3501/RiceCatRobot/commands/ToggleClaw.java
@@ -1,6 +1,6 @@
 package org.usfirst.frc3501.RiceCatRobot.commands;
 
-import org.usfirst.frc3501.RiceCatRobot.Robot;
+import org.usfirst.frc3501.RiceCatRobot.robot.Robot;
 
 import edu.wpi.first.wpilibj.command.Command;