Merge remote-tracking branch 'origin/main' into 3-poussoir

src/main/java/frc/robot/commands/Activer_poussoir.java

@@ -34,4 +34,3 @@ public class Activer_poussoir extends CommandBase {
   }
 }
 
-

src/main/java/frc/robot/subsystems/pistonshaker.java

@@ -29,4 +29,5 @@ public void rentrerpiston() {
   
     // This method will be called once per scheduler run
   }
+  
 }