Actually fixed merge conflicts

EZ-Robotics · Sep 7, 2024 · 84fce80 · 84fce80
1 parent 5a76dc6
commit 84fce80
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/include/EZ-Template/drive/drive.hpp b/include/EZ-Template/drive/drive.hpp
@@ -2337,11 +2337,6 @@ class Drive {
   bool slew_swing_using_angle = false;
   bool pid_tuner_terminal_b = false;
   bool pid_tuner_lcd_b = true;
-  struct const_and_name {
-    std::string name = "";
-    PID::Constants* consts;
-  };
-  std::vector<const_and_name> constants;
   void pid_tuner_print();
   void pid_tuner_value_modify(float p, float i, float d, float start);
   void pid_tuner_value_increase();