From 51fcbfe7bb1a307886d5e72ee8d62746664fd32e Mon Sep 17 00:00:00 2001 From: samuel desharnais Date: Wed, 8 Feb 2023 19:17:11 -0500 Subject: [PATCH 1/2] ghn --- src/main/java/frc/robot/Constants.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/main/java/frc/robot/Constants.java b/src/main/java/frc/robot/Constants.java index c6ffe06..3b88ae7 100644 --- a/src/main/java/frc/robot/Constants.java +++ b/src/main/java/frc/robot/Constants.java @@ -5,15 +5,6 @@ public class Constants { public static int avantgauche = 1; public static int arrieredroit = 2; public static int arrieregauche = 3; -<<<<<<< HEAD public static int BrasTelescopique = 5; - - - - - - -======= public static int actuateur = 4; ->>>>>>> 91d5a71d52bad9fc56b40c68d78207113e16cd21 } From 48259c9fcef533cfc4c76020b5b7862858c0627b Mon Sep 17 00:00:00 2001 From: samuel desharnais Date: Wed, 8 Feb 2023 19:22:22 -0500 Subject: [PATCH 2/2] hgvn --- src/main/java/frc/robot/Constants.java | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/main/java/frc/robot/Constants.java b/src/main/java/frc/robot/Constants.java index 1b12241..bda0c2e 100644 --- a/src/main/java/frc/robot/Constants.java +++ b/src/main/java/frc/robot/Constants.java @@ -5,25 +5,9 @@ public class Constants { public static int avantgauche = 1; public static int arrieredroit = 2; public static int arrieregauche = 3; -<<<<<<< HEAD - public static int BrasTelescopique = 5; -======= -<<<<<<< HEAD // pneumatique public static int pistonpinceouvre = 0; public static int pistonpinceferme = 1; - -======= -<<<<<<< HEAD public static int BrasTelescopique = 5; ->>>>>>> a6d29dff41c9186a3dd56354d6416a625159f366 - - - - - - -======= ->>>>>>> 574a86d6fc0c2873af374a5d04dc6081c08a4c02 public static int actuateur = 4; }