From bd1abdf58823f0dfb98ff8cd39331902ba505e4c Mon Sep 17 00:00:00 2001
From: maxwtan <100314265+MaxwellTTan20@users.noreply.github.com>
Date: Mon, 16 Feb 2026 12:21:10 -0800
Subject: [PATCH] Update RobotContainer.java

---
 src/main/java/frc/robot/RobotContainer.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
index 3513a21..0c8b25d 100644
--- 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() {
-- 
2.39.5