X-Git-Url: http://challenge-bot.com/repos/?p=3501%2F2017steamworks;a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FRobot.java;h=908a52dcf0339b44735147d174f069500b873280;hp=5f4715cb6ac2e9b1fcb8a7e1bef891cc95163eae;hb=174f415cc59c15eb1bf0cbe305d1f3419914d116;hpb=9b35aa55bb9b437483e2886f9cf56f0812e19094

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index 5f4715c..908a52d 100644
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -1,5 +1,9 @@
 package org.usfirst.frc.team3501.robot;
 
+<<<<<<< HEAD
+=======
+import org.usfirst.frc.team3501.robot.commands.driving.DriveDistance;
+>>>>>>> fix bugs
 import org.usfirst.frc.team3501.robot.subsystems.DriveTrain;
 import org.usfirst.frc.team3501.robot.subsystems.Intake;
 import org.usfirst.frc.team3501.robot.subsystems.Shooter;
@@ -39,6 +43,10 @@ public class Robot extends IterativeRobot {
 
   @Override
   public void autonomousInit() {
+<<<<<<< HEAD
+=======
+    Scheduler.getInstance().add(new DriveDistance(25, 10));
+>>>>>>> fix bugs
   }
 
   @Override