From 7a8dfb3a1318b8c4449473a1d3a948eb66213a3c Mon Sep 17 00:00:00 2001 From: OlivierDubois Date: Mon, 12 Feb 2024 19:15:10 -0500 Subject: [PATCH] s --- src/main/java/frc/robot/RobotContainer.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index 1e54a52..cfde281 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -71,13 +71,8 @@ public class RobotContainer { LancerNote lancernote = new LancerNote(lanceur, accumulateur); Lancerampli lancerampli = new Lancerampli(lanceur,limelight); GrimpeurDroit grimpeurDroit = new GrimpeurDroit(grimpeur, manette::getLeftX); -<<<<<<< HEAD - GrimpeurGauche grimpeurGauche = new GrimpeurGauche(grimpeur, manette::getLeftY); - AllumeLED allumeLED = new AllumeLED(LED,accumulateur); -======= GrimpeurGauche grimpeurGauche = new GrimpeurGauche(grimpeur, manette::getRightX); AllumeLED allumeLED = new AllumeLED(LED, accumulateur); ->>>>>>> 7a37782ca19fb71cb842174cd8fcd536eda825a9 Pistongrimpeur pistongrimpeur = new Pistongrimpeur(grimpeur, LED); public RobotContainer() { dashboard.addCamera("limelight", "limelight","limelight.local:5800");