Auto stash before merge of "feat/elevator" and "origin/feat/elevator"

Iron-Panthers · Nov 22, 2023 · 06bb8a0 · 06bb8a0
1 parent 2f14bfc
commit 06bb8a0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id "java"
-    id "edu.wpi.first.GradleRIO" version "2023.4.2"
+    id "edu.wpi.first.GradleRIO" version "2023.4.3"
     id "com.diffplug.spotless" version "6.13.0"
     id "me.champeau.jmh" version "0.6.8"
 }

diff --git a/src/main/java/frc/util/ControllerUtil.java b/src/main/java/frc/util/ControllerUtil.java
@@ -37,4 +37,4 @@ public static BooleanSupplier cumBooleanSupplier(
       BooleanSupplier layer, boolean layerState, BooleanSupplier button) {
     return () -> layer.getAsBoolean() == layerState && button.getAsBoolean();
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,4 +37,4 @@ public static BooleanSupplier cumBooleanSupplier( @@
           BooleanSupplier layer, boolean layerState, BooleanSupplier button) {
         return () -> layer.getAsBoolean() == layerState && button.getAsBoolean();
       }
-    }
+    }