fix conflicts

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

diff --git a/src/org/usfirst/frc3501/RiceCatRobot/commands/TurnFor.java b/src/org/usfirst/frc3501/RiceCatRobot/commands/TurnFor.java
index 4abe13bd3f980ad756606282c51fabd86997107e..580fe06875f3c8badf04684ac9b8fc4af48c4808 100644 (file)
--- a/src/org/usfirst/frc3501/RiceCatRobot/commands/TurnFor.java
+++ b/src/org/usfirst/frc3501/RiceCatRobot/commands/TurnFor.java
@@ -1,7 +1,7 @@
 package org.usfirst.frc3501.RiceCatRobot.commands;
 
-import org.usfirst.frc3501.RiceCatRobot.Robot;
-import org.usfirst.frc3501.RiceCatRobot.RobotMap.Direction;
+import org.usfirst.frc3501.RiceCatRobot.robot.Robot;
+import org.usfirst.frc3501.RiceCatRobot.robot.RobotMap.Direction;
 
 import edu.wpi.first.wpilibj.Timer;
 import edu.wpi.first.wpilibj.command.Command;