From f391d1540becb7ddbaa1e6e979f358c5a17143e9 Mon Sep 17 00:00:00 2001
From: NoahLacks63 <apexdeadlyranger@gmail.com>
Date: Wed, 15 Jan 2025 02:24:19 +0000
Subject: [PATCH] One more fix to resolve Noah's merge conflict for him

---
 src/main/java/frc/robot/constants/ElevatorConstants.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/frc/robot/constants/ElevatorConstants.java b/src/main/java/frc/robot/constants/ElevatorConstants.java
index 7f1efe9..7654164 100644
--- a/src/main/java/frc/robot/constants/ElevatorConstants.java
+++ b/src/main/java/frc/robot/constants/ElevatorConstants.java
@@ -33,6 +33,8 @@ public class ElevatorConstants {
     public static final double kFeedForwardG = 0;
     public static final double kFeedForwardV = 0;
 
+    public static final double kElevatorMaxVelocity = 0;
+
     // 1, 7, 10 are the defaults for these, change as necessary
     public static final double kSysIDRampRate = 1;
     public static final double kSysIDStepVolts = 7;