From 86f3c087f77b3fddd6a9874385e1b55c0db34b6a Mon Sep 17 00:00:00 2001
From: Nate Laverdure <41549690+nlaverdure@users.noreply.github.com>
Date: Sat, 3 Feb 2024 18:58:31 -0500
Subject: [PATCH] Revert additional errors from previous merge conflict
 resolution (#79)

revert additional errors from #74 merge conflict resolution
---
 src/main/java/frc/robot/RobotContainer.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
index b68189c..270331a 100644
--- a/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@ -30,6 +30,7 @@ public class RobotContainer {
 
   private Autonomous m_autonomous;
 
+  // spotless:off
   public RobotContainer() {
 
     for (int i = 0; i < AutoConstants.kAutonomousModeSelectorPorts.length; i++) {
@@ -42,13 +43,13 @@ public RobotContainer() {
     // m_intake.setDefaultCommand(m_intake.createStopIntakeCommand());
 
     // Create a button on Smart Dashboard to reset the encoders.
-    SmartDashboard.putData(
-        "Align Encoders",
+    SmartDashboard.putData("Align Encoders",
         new InstantCommand(() -> m_swerve.zeroAbsTurningEncoderOffsets()).ignoringDisable(true));
 
     // Driver controller buttons
     new JoystickButton(m_driver, OIConstants.kZorroDIn)
         .onTrue(new InstantCommand(() -> m_swerve.resetHeading()).ignoringDisable(true));
+    
     // Command lowerArmCommand = m_arm.createLowerArmCommand();
     // Command raiseArmCommmand = m_arm.createRaiseArmCommand();
     // // Operator controller buttons
@@ -71,7 +72,6 @@ public RobotContainer() {
     //     .whileTrue((m_intake.createSetVoltageCommand(10.0)));
     //     // .onlyIf(raiseArmCommmand::isScheduled));
   }
-
   // spotless:on
 
   /**