ghn

2023-02-08 19:17:11 -05:00
parent a6d29dff41
commit 51fcbfe7bb
1 changed files with 0 additions and 9 deletions
--- 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
 }