From c0478b01a526712b8308ac329017857177a3c876 Mon Sep 17 00:00:00 2001 From: Tyler Wilcox Date: Sat, 11 Apr 2026 14:09:39 -0400 Subject: [PATCH] Fix merge conflict --- .../frc/robolib/drivesystems/swerve/SwerveDriveSystem.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/src/main/java/org/fairportrobotics/frc/robolib/drivesystems/swerve/SwerveDriveSystem.java b/lib/src/main/java/org/fairportrobotics/frc/robolib/drivesystems/swerve/SwerveDriveSystem.java index 7dec37d..91faf3b 100644 --- a/lib/src/main/java/org/fairportrobotics/frc/robolib/drivesystems/swerve/SwerveDriveSystem.java +++ b/lib/src/main/java/org/fairportrobotics/frc/robolib/drivesystems/swerve/SwerveDriveSystem.java @@ -2,12 +2,9 @@ package org.fairportrobotics.frc.robolib.drivesystems.swerve; import java.util.Arrays; -<<<<<<< Updated upstream import org.littletonrobotics.junction.ConsoleSource.RoboRIO; -======= import com.ctre.phoenix.motorcontrol.NeutralMode; ->>>>>>> Stashed changes import com.ctre.phoenix6.CANBus; import com.ctre.phoenix6.Utils; import com.ctre.phoenix6.hardware.Pigeon2;