Fixed merge

team4976 · Feb 29, 2020 · 05c5b42 · 05c5b42
1 parent 519c89e
commit 05c5b42
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 2 deletions.
diff --git a/.gradle/6.0.1/fileHashes/fileHashes.lock b/.gradle/6.0.1/fileHashes/fileHashes.lock
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/src/main/java/frc/robot/Robot.java b/src/main/java/frc/robot/Robot.java
@@ -8,8 +8,6 @@
 import edu.wpi.first.wpilibj.PowerDistributionPanel;
 import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
 import frc.robot.commands.auto.AutoSequenceCentre;
-import frc.robot.commands.auto.AutoSequenceLeft;
-import frc.robot.commands.auto.AutoSequenceRight;
 import frc.robot.commands.auto.AutoSequenceTest;
 import frc.robot.subsystems.*;
 import edu.wpi.first.wpilibj.command.Scheduler;