From 8f8633a250aac11b5fbe2df0a82ab27474bd4fb6 Mon Sep 17 00:00:00 2001
From: OlivierDubois <odubois02@csbf.qc.ca>
Date: Sat, 17 Feb 2024 13:47:53 -0500
Subject: [PATCH] s

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

diff --git a/src/main/java/frc/robot/subsystem/Accumulateur.java b/src/main/java/frc/robot/subsystem/Accumulateur.java
index 22611c4..cf52f21 100644
--- a/src/main/java/frc/robot/subsystem/Accumulateur.java
+++ b/src/main/java/frc/robot/subsystem/Accumulateur.java
@@ -18,11 +18,7 @@ public class Accumulateur extends SubsystemBase {
  
   ShuffleboardTab dashboard = Shuffleboard.getTab("dashboard");
    private GenericEntry vitesse =
-<<<<<<< HEAD
-      dashboard.add("vitesseacc", 0.1)
-=======
       dashboard.add("vitesseacc", 0.5)
->>>>>>> 9d55ab9afa804a6ffb304aee298f28ad470c396d
       .withSize(1, 1)
       .withPosition(4, 3)
       .getEntry();