From f127366f40f7cbda4ffb5608f266df63ae21d27f Mon Sep 17 00:00:00 2001 From: Sachet Korada Date: Wed, 20 Nov 2024 12:10:42 -0500 Subject: [PATCH] Cleanup --- .../ftc/teamcode/commands/elevator/SpinDownCommand.kt | 4 ---- .../ftc/teamcode/commands/elevator/SpinUpCommand.kt | 4 ---- 2 files changed, 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 index 695a894..4587917 100644 --- 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 index 10f87e8..75781a5 100644 --- 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