Still resolving merge conflict

2025-01-15 02:21:48 +00:00 · 2025-01-15 02:21:48 +00:00 · 5f111cd4ee
commit 5f111cd4ee
parent adb17f9cea
1 changed files with 0 additions and 3 deletions
--- a/src/main/java/frc/robot/constants/ArmConstants.java
+++ b/src/main/java/frc/robot/constants/ArmConstants.java
@ -5,9 +5,6 @@ public class ArmConstants {
    public static final int kCANcoderID = 0;

    public static final double kEncoderConversionFactor = 0;
-<<<<<<< HEAD

    public static final double kArmMaxVelocity = 0;
-=======
->>>>>>> f4908e4051cd2c1ce41df73debe5e7e2cc506c4a
 }