fix conflicts
[3501/2015-FRC-Spark] / src / org / usfirst / frc3501 / RiceCatRobot / commands / OpenClaw.java
index 101ae75f6e7e552a5d1c88612e9840aeda9b7295..c0d351d425d563e45311208d7101df0f21cf4704 100644 (file)
@@ -2,7 +2,7 @@ package org.usfirst.frc3501.RiceCatRobot.commands;
 
 import edu.wpi.first.wpilibj.command.Command;
 
-import org.usfirst.frc3501.RiceCatRobot.Robot;
+import org.usfirst.frc3501.RiceCatRobot.robot.Robot;
 
 /**
  * Opens claw by reversing solenoids.