hgjkl

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

@@ -4,14 +4,12 @@
 
 package frc.robot.subsystems;
 
-<<<<<<< HEAD
 import edu.wpi.first.wpilibj2.command.SubsystemBase;
 
 public class Gratte extends SubsystemBase {
   /** Creates a new Gratte. */
   public Gratte() {}
 
-=======
 import com.ctre.phoenix.motorcontrol.can.WPI_TalonSRX;
 import com.fasterxml.jackson.annotation.JacksonInject.Value;
 
@@ -46,7 +44,6 @@ public class Gratte extends SubsystemBase {
     baisserGratte.set(vitesse);
     leverGratte.set(vitesse);
   }
->>>>>>> Gratte
   @Override
   public void periodic() {
     // This method will be called once per scheduler run