From 6eed14fe811c9ab1a054ec5dfce67aac3e20601e Mon Sep 17 00:00:00 2001
From: Zelina974 <elina.claerebout@gmail.com>
Date: Sun, 31 Mar 2024 15:58:19 +0200
Subject: [PATCH] add something

---
 ftc2024_autonome_api.java | 4 ----
 ftc_new.java              | 3 ++-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/ftc2024_autonome_api.java b/ftc2024_autonome_api.java
index 4424484..2b3a3a5 100644
--- a/ftc2024_autonome_api.java
+++ b/ftc2024_autonome_api.java
@@ -32,11 +32,7 @@ public class Ftc2024_autonome_api extends LinearOpMode {
 	public void runOpMode() {
 		lm = hardwareMap.get(DcMotor.class, "blm");
 		rm = hardwareMap.get(DcMotor.class, "brm");
-<<<<<<< HEAD
 		harvestmotor = hardwareMap.get(DcMotor.class, "moissonneuse");
-=======
-		harvestmotor = hardwareMap.get(DcMotor.class, "moissoneuse");
->>>>>>> a8ae6d3 (hello)
 
 		rm.setDirection(DcMotor.Direction.REVERSE);
 
diff --git a/ftc_new.java b/ftc_new.java
index c4b877e..96f1555 100644
--- a/ftc_new.java
+++ b/ftc_new.java
@@ -252,6 +252,7 @@ public class Werobot_FTC2024_carlike extends LinearOpMode {
                 already_down = false;
             }
             
+            // commentaires supprimés dans le robot
             // if (gamepad1.x && !already_x){
                 
             //     int targetPos = 0;
@@ -329,7 +330,7 @@ public class Werobot_FTC2024_carlike extends LinearOpMode {
             if (gamepad1.right_bumper && gamepad1.left_bumper){
                 // launch the plane
             }
-            
+
             telemetry.addData("x", x);
             telemetry.addData("y", y);
             telemetry.addData("lpow", lpower);