gb

2023-03-08 19:55:28 -05:00
parent f92290302a
commit 23806ebfa2
3 changed files with 1 additions and 16 deletions
--- a/src/main/java/frc/robot/subsystems/Gratte.java
+++ b/src/main/java/frc/robot/subsystems/Gratte.java
@ -13,10 +13,7 @@ import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardTab;
 import frc.robot.Constants;

 public class Gratte extends SubsystemBase {
-<<<<<<< HEAD

-=======
->>>>>>> aabe9b40ae896a36acdc9cd17a508016a3660a0a
 ShuffleboardTab teb = Shuffleboard.getTab("teb"); 
 ShuffleboardLayout limitswitchgratte = Shuffleboard.getTab("teb")
 .getLayout("limitswitchsgratte", BuiltInLayouts.kList)
--- a/src/main/java/frc/robot/subsystems/bras/Pivot.java
+++ b/src/main/java/frc/robot/subsystems/bras/Pivot.java
@ -14,10 +14,7 @@ import com.revrobotics.CANSparkMax;
 import com.revrobotics.CANSparkMaxLowLevel.MotorType;

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

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