fix conflicts

[3501/2015-FRC-Spark] / src / org / usfirst / frc3501 / RiceCatRobot / auton / MoveForwardFiveFt.java

diff --git a/src/org/usfirst/frc3501/RiceCatRobot/auton/MoveForwardFiveFt.java b/src/org/usfirst/frc3501/RiceCatRobot/auton/MoveForwardFiveFt.java
new file mode 100644 (file)
index 0000000..a67740e
--- /dev/null
+++ b/src/org/usfirst/frc3501/RiceCatRobot/auton/MoveForwardFiveFt.java
@@ -0,0 +1,15 @@
+package org.usfirst.frc3501.RiceCatRobot.auton;
+
+import org.usfirst.frc3501.RiceCatRobot.commands.MoveDistance;
+import org.usfirst.frc3501.RiceCatRobot.robot.Robot;
+
+import edu.wpi.first.wpilibj.command.CommandGroup;
+
+public class MoveForwardFiveFt extends CommandGroup{
+       
+       public MoveForwardFiveFt (){
+               requires(Robot.driveTrain);
+               
+               addSequential(new MoveDistance(60, 0, 0.5));
+       }
+}