From be5abb84bdf555e890544b5371f1648310daf854 Mon Sep 17 00:00:00 2001
From: OlivierDubois <odubois02@csbf.qc.ca>
Date: Wed, 27 Nov 2024 18:17:33 -0500
Subject: [PATCH] 8,0 6,0

---
 src/main/java/frc/robot/RobotContainer.java | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
index ce15bfc..c79d61d 100644
--- a/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@ -43,15 +43,9 @@ public class RobotContainer {
     drive.setDefaultCommand(new RunCommand(()->{
      drive.drive(-MathUtil.applyDeadband(manette.getRightX(),0.2), MathUtil.applyDeadband(-manette.getRightY(),0.2), MathUtil.applyDeadband(-manette.getRightX(), 0.2));
     },drive));
-<<<<<<< HEAD
    // dashboard.add("autochooser",autoChooser)
    //   .withSize(1,1)
-    //  .withPosition(6,0);
-=======
-    dashboard.add("autochooser",autoChooser)
-      .withSize(1,1)
-      .withPosition(8,0);
->>>>>>> 3f240407849e489fb0b5fae52b61719f27c7b388
+    //  .withPosition(8,0);
   }
   
   private void configureBindings() {