From a13fdba677a1a02b322e8b297cab2bb866c7747c Mon Sep 17 00:00:00 2001
From: Antoine PerreaultE <KalcioGx53@hotmail.com>
Date: Mon, 20 Mar 2023 18:10:45 -0400
Subject: [PATCH] kk

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

diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
index 0a0f662..4ba220d 100644
--- a/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@ -54,7 +54,6 @@ public class RobotContainer {
   
 CommandXboxController manette1 = new CommandXboxController(0);
 CommandXboxController manette2 = new CommandXboxController(1);
-<<<<<<< HEAD
 
 // dashboard
 SendableChooser<String> chooser = new SendableChooser<>();
@@ -62,8 +61,6 @@ String enhaut = "en haut";
 String aumilieux = "au milieux";
 String enbas = "en bas";
 String nulpart = "nul part";
-=======
->>>>>>> 18e7c292ce3d2882eb58ef622b7e497d43d99fea
 ShuffleboardLayout layoutauto = Shuffleboard.getTab("teb").getLayout("auto",BuiltInLayouts.kList)
 .withSize(2, 2).withProperties(Map.of("Label position","LEFT"));
 GenericEntry autobalance = layoutauto.add("choix balance",true).withWidget(BuiltInWidgets.kToggleSwitch).getEntry();
@@ -105,11 +102,6 @@ PivotManuel pivotManuel = new PivotManuel(pivot,manette2::getLeftX);
 BrasManuel brasManuel = new BrasManuel(brasTelescopique,manette2::getLeftY);
 
 
-SendableChooser<String> chooser = new SendableChooser<>();
-String enhaut = "en bas";
-String aumilieux = "au milieux";
-String enbas = "en bas";
-String nulpart = "nul part";
 public RobotContainer() {
     chooser.addOption(enhaut, enhaut);
     chooser.addOption(enbas, enbas);