s

2024-02-17 13:47:53 -05:00 · 2024-02-17 13:47:53 -05:00 · 8f8633a250
commit 8f8633a250
parent e8855ae51b
1 changed files with 0 additions and 4 deletions
--- 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();