From 78ef2c117c3da85c7112c152c7cc7a79a7111cc8 Mon Sep 17 00:00:00 2001
From: ryan123rudder <42309874+ryan123rudder@users.noreply.github.com>
Date: Thu, 15 Apr 2021 16:57:40 -0600
Subject: [PATCH] Fixed Merge Error

---
 src/main/java/frc4388/robot/RobotContainer.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/frc4388/robot/RobotContainer.java b/src/main/java/frc4388/robot/RobotContainer.java
index 66745cf..2e4d91c 100644
--- a/src/main/java/frc4388/robot/RobotContainer.java
+++ b/src/main/java/frc4388/robot/RobotContainer.java
@@ -65,7 +65,6 @@ import frc4388.robot.commands.shooter.ShooterVelocityControlPID;
 import frc4388.robot.commands.shooter.TrackTarget;
 import frc4388.robot.commands.shooter.TrimShooter;
 import frc4388.robot.commands.storage.ManageStorage;
-import frc4388.robot.commands.storage.ManageStorage.StorageMode;
 import frc4388.robot.commands.storage.StoragePrep;
 import frc4388.robot.subsystems.Camera;
 import frc4388.robot.subsystems.Climber;