From 05c5b42431d07f25be68be62a117f22ae6e75030 Mon Sep 17 00:00:00 2001
From: Jack Fountain <jack@rockyroost.com>
Date: Sat, 29 Feb 2020 17:21:21 -0500
Subject: [PATCH] Fixed merge

---
 .gradle/6.0.1/fileHashes/fileHashes.lock          | Bin 17 -> 17 bytes
 .../buildOutputCleanup/buildOutputCleanup.lock    | Bin 17 -> 17 bytes
 src/main/java/frc/robot/Robot.java                |   2 --
 3 files changed, 2 deletions(-)

diff --git a/.gradle/6.0.1/fileHashes/fileHashes.lock b/.gradle/6.0.1/fileHashes/fileHashes.lock
index 57fb1f53cbe77729da3f61c05efc278563a66e66..be00244aee856a44b2ba6aa0b78db78ec7a95821 100644
GIT binary patch
literal 17
VcmZSH)O)92N563?0~iSO001_M1j_&b

literal 17
VcmZSH)O)92N563?0~iQI0{}Kz1eyQ<

diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 72e6b4755e8027141fceeac569f447863a6d0f8d..513a7b961e4754b38cc5fc9134b359d4cc6ce03f 100644
GIT binary patch
literal 17
VcmZR+JO4xEWYG)*1~6dB0RT4%1bF}e

literal 17
VcmZR+JO4xEWYG)*1~6br001`q1Z@BS

diff --git a/src/main/java/frc/robot/Robot.java b/src/main/java/frc/robot/Robot.java
index a8ec33c..f0aa420 100755
--- 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;