fix conflicts

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

diff --git a/src/org/usfirst/frc3501/RiceCatRobot/commands/DriveFor.java b/src/org/usfirst/frc3501/RiceCatRobot/commands/DriveFor.java
index e2473538094e9aa233c946b99f00c017e8763669..ee6fe267ab51965b3174fe553d43608beda6c8fc 100644 (file)
--- a/src/org/usfirst/frc3501/RiceCatRobot/commands/DriveFor.java
+++ b/src/org/usfirst/frc3501/RiceCatRobot/commands/DriveFor.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;