Update RobotContainer.java

diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
index 3513a21adeb87f027370476ac1edb27640848a75..0c8b25d71b910c6d842bf5e61aeee19c9ef38153 100644 (file)
--- a/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@ -163,10 +163,6 @@ public class RobotContainer {
   }
 
   public void registerCommands() {
-<<<<<<< HEAD
-=======
-
->>>>>>> parent of ae21e1f7 (Merge branch 'arnavs-mega-velocityvoltage-turret' into beta-bot)
   }
 
   public static BooleanSupplier getAllianceColorBooleanSupplier() {