From 51fcbfe7bb1a307886d5e72ee8d62746664fd32e Mon Sep 17 00:00:00 2001 From: samuel desharnais Date: Wed, 8 Feb 2023 19:17:11 -0500 Subject: [PATCH] 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 }