Team_2648/2025_Robot_Code
5
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Still resolving merge conflict

Browse Source
This commit is contained in:
NoahLacks63 committed 2025-01-15 02:21:48 +00:00
1 parent adb17f9cea
commit 5f111cd4ee
1 file changed
-3
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/frc/robot/constants/ArmConstants.java
-3
View File
@@ -5,9 +5,6 @@ public class ArmConstants {
public static final int kCANcoderID = 0; public static final int kCANcoderID = 0;
public static final double kEncoderConversionFactor = 0; public static final double kEncoderConversionFactor = 0;
<<<<<<< HEAD
public static final double kArmMaxVelocity = 0; public static final double kArmMaxVelocity = 0;
=======
>>>>>>> f4908e4051cd2c1ce41df73debe5e7e2cc506c4a
} }