third commit

2026-02-20 16:57:35 -05:00
parent aa50a664e5
commit 44245a11e5
9 changed files with 1 additions and 101 deletions
--- a/src/main/java/frc/robot/subsystems/swervedrive/SwerveSubsystem.java
+++ b/src/main/java/frc/robot/subsystems/swervedrive/SwerveSubsystem.java
@@ -62,11 +62,7 @@ public class SwerveSubsystem extends SubsystemBase {
    /**
     * Enable vision odometry updates while driving.
     */
-<<<<<<< HEAD
-    private final boolean visionDriveTest = true;
-=======
    private final boolean visionDriveTest = false;
->>>>>>> a50d67d7f53337b144e2b1afb5f7b644747fb21f

    /**
     * PhotonVision class to keep an accurate odometry.