Merge branch 'main' of https://demerso.net/pls5618/2023/robot

2023-03-08 19:51:20 -05:00
parent 50cf278f00 aabe9b40ae
commit f92290302a
4 changed files with 14 additions and 51 deletions
--- a/src/main/java/frc/robot/subsystems/bras/Pivot.java
+++ b/src/main/java/frc/robot/subsystems/bras/Pivot.java
@@ -14,7 +14,10 @@ import com.revrobotics.CANSparkMax;
 import com.revrobotics.CANSparkMaxLowLevel.MotorType;

 public class Pivot extends SubsystemBase {
+<<<<<<< HEAD

+=======
+>>>>>>> aabe9b40ae896a36acdc9cd17a508016a3660a0a
 ShuffleboardTab teb = Shuffleboard.getTab("teb");
  
  // moteur