Cleanup

ftc13100 · Nov 20, 2024 · f127366 · f127366
1 parent 541faeb
commit f127366
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/TeamCode/src/main/kotlin/org/firstinspires/ftc/teamcode/commands/elevator/SpinDownCommand.kt b/TeamCode/src/main/kotlin/org/firstinspires/ftc/teamcode/commands/elevator/SpinDownCommand.kt
@@ -1,8 +1,4 @@
-<<<<<<<< HEAD:TeamCode/src/main/kotlin/org/firstinspires/ftc/teamcode/commands/slides/SpinDownCommand.kt
-package org.firstinspires.ftc.teamcode.commands.slides
-========
 package org.firstinspires.ftc.teamcode.commands.elevator
->>>>>>>> 509c48b (Arm PID infra:):TeamCode/src/main/kotlin/org/firstinspires/ftc/teamcode/commands/elevator/SpinDownCommand.kt
 
 import com.arcrobotics.ftclib.command.CommandBase
 import org.firstinspires.ftc.teamcode.subsystems.slides.OpenSlidesSubsystem

diff --git a/TeamCode/src/main/kotlin/org/firstinspires/ftc/teamcode/commands/elevator/SpinUpCommand.kt b/TeamCode/src/main/kotlin/org/firstinspires/ftc/teamcode/commands/elevator/SpinUpCommand.kt
@@ -1,8 +1,4 @@
-<<<<<<<< HEAD:TeamCode/src/main/kotlin/org/firstinspires/ftc/teamcode/commands/slides/SpinUpCommand.kt
-package org.firstinspires.ftc.teamcode.commands.slides
-========
 package org.firstinspires.ftc.teamcode.commands.elevator
->>>>>>>> 509c48b (Arm PID infra:):TeamCode/src/main/kotlin/org/firstinspires/ftc/teamcode/commands/elevator/SpinUpCommand.kt
 
 import com.arcrobotics.ftclib.command.CommandBase
 import org.firstinspires.ftc.teamcode.subsystems.slides.OpenSlidesSubsystem