fix conflicts

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

diff --git a/src/org/usfirst/frc3501/RiceCatRobot/commands/ToggleCompressor.java b/src/org/usfirst/frc3501/RiceCatRobot/commands/ToggleCompressor.java
index 64c34f9f4078296dde2b83a52a63952ec945d7e3..3669eaf88568d30fa87f176ec30ec53b13e071f4 100644 (file)
--- a/src/org/usfirst/frc3501/RiceCatRobot/commands/ToggleCompressor.java
+++ b/src/org/usfirst/frc3501/RiceCatRobot/commands/ToggleCompressor.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;