fdvhnbm

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

@@ -3,13 +3,7 @@
 // the WPILib BSD license file in the root directory of this project.
 
 package frc.robot.subsystems;
-
 import edu.wpi.first.wpilibj2.command.SubsystemBase;
-
-import javax.swing.text.StyledEditorKit.BoldAction;
-
-import org.apache.commons.collections4.functors.IfClosure;
-
 import com.ctre.phoenix.motorcontrol.can.WPI_TalonSRX;
 import edu.wpi.first.wpilibj.DigitalInput;
 import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard;
@@ -53,22 +47,13 @@ ShuffleboardLayout limitswitchgratte = Shuffleboard.getTab("teb")
   public boolean basg(){
     return limitbg.get();
   }
-  /** Creates a new Gratte. */
-<<<<<<< HEAD
-  public Gratte() {
-   
-  }
-  
-  
-
-=======
+ 
   public Gratte() {   
     limitswitchgratte.add ("limitbd", 0.1);
     limitswitchgratte.add ("limithg", 0.1);
     limitswitchgratte.add ("limithd", 0.1);
     limitswitchgratte.add ("limitbg", 0.1);
   }
->>>>>>> a50cbc2cf5643bf54839bb1e5520aa0bf79cd925
   public void Lever(double vitesse){
     Gratted.set(vitesse);
     Gratteg.set(vitesse);
@@ -78,15 +63,10 @@ ShuffleboardLayout limitswitchgratte = Shuffleboard.getTab("teb")
     Gratteg.set(-vitesse);
   }
   @Override
-<<<<<<< HEAD
   public void periodic(){
     limitswitchgratte.add ("limitbd", 0.1);
     limitswitchgratte.add ("limithg", 0.1);
     limitswitchgratte.add ("limithd", 0.1);
     limitswitchgratte.add ("limitbg", 0.1);
-=======
-  public void periodic() {
-
->>>>>>> a50cbc2cf5643bf54839bb1e5520aa0bf79cd925
-  }
+}
 }