FairportRobotics
/
RoboLib
mirror of https://github.com/FairportRobotics/RoboLib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict

This commit is contained in:
Tyler Wilcox 2026-04-11 14:09:39 -04:00
parent 191af3083d
commit c0478b01a5
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/src/main/java/org/fairportrobotics/frc/robolib/drivesystems/swerve/SwerveDriveSystem.java
View File

@ -2,12 +2,9 @@ package org.fairportrobotics.frc.robolib.drivesystems.swerve;
import java.util.Arrays; import java.util.Arrays;
<<<<<<< Updated upstream
import org.littletonrobotics.junction.ConsoleSource.RoboRIO; import org.littletonrobotics.junction.ConsoleSource.RoboRIO;
=======
import com.ctre.phoenix.motorcontrol.NeutralMode; import com.ctre.phoenix.motorcontrol.NeutralMode;
>>>>>>> Stashed changes
import com.ctre.phoenix6.CANBus; import com.ctre.phoenix6.CANBus;
import com.ctre.phoenix6.Utils; import com.ctre.phoenix6.Utils;
import com.ctre.phoenix6.hardware.Pigeon2; import com.ctre.phoenix6.hardware.Pigeon2;