From 06bb8a0d00250d7768181d62130745e69d2e776e Mon Sep 17 00:00:00 2001 From: Ethan Li Date: Tue, 21 Nov 2023 16:35:06 -0800 Subject: [PATCH] Auto stash before merge of "feat/elevator" and "origin/feat/elevator" --- build.gradle | 2 +- src/main/java/frc/util/ControllerUtil.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index a4506c2..6ca535d 100644 --- 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 index dbf30ed..4ef37d0 100644 --- 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(); } -} +} \ No newline at end of file