From f77712aa945c16d4ae6e070a71d9c6e912f15c1a Mon Sep 17 00:00:00 2001
From: Michael Mikovsky <77305074+Astatin3@users.noreply.github.com>
Date: Tue, 27 Aug 2024 17:15:22 -0600
Subject: [PATCH] merge conflict

---
 src/main/java/frc4388/robot/subsystems/Intake.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/frc4388/robot/subsystems/Intake.java b/src/main/java/frc4388/robot/subsystems/Intake.java
index 7d7294c..5ffa72a 100644
--- a/src/main/java/frc4388/robot/subsystems/Intake.java
+++ b/src/main/java/frc4388/robot/subsystems/Intake.java
@@ -107,4 +107,4 @@ public class Intake extends SubsystemBase {
   public void periodic() {
     resetArmPosition();
   }
-}
+}
\ No newline at end of file