Delete residual files from merge commits?

diff --git a/src/org/usfirst/frc/team3501/robot/commands/intakearm/MoveIntakeArmUp.java~HEAD b/src/org/usfirst/frc/team3501/robot/commands/intakearm/MoveIntakeArmUp.java~HEAD
deleted file mode 100644 (file)
index c22bf82..0000000
--- a/src/org/usfirst/frc/team3501/robot/commands/intakearm/MoveIntakeArmUp.java~HEAD
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.usfirst.frc.team3501.robot.commands.intakearm;
-
-import edu.wpi.first.wpilibj.command.Command;
-
-public class MoveIntakeArmUp extends Command {
-
-  public MoveIntakeArmUp() {
-  }
-
-  @Override
-  protected void initialize() {
-  }
-
-  @Override
-  protected void execute() {
-  }
-
-  @Override
-  protected boolean isFinished() {
-    return false;
-  }
-
-  @Override
-  protected void end() {
-  }
-
-  @Override
-  protected void interrupted() {
-  }
-}

diff --git a/src/org/usfirst/frc/team3501/robot/commands/intakearm/MoveIntakeArmUp.java~Refactor commands and change drivetrain to pid b/src/org/usfirst/frc/team3501/robot/commands/intakearm/MoveIntakeArmUp.java~Refactor commands and change drivetrain to pid
deleted file mode 100644 (file)
index bc7b824..0000000
--- a/src/org/usfirst/frc/team3501/robot/commands/intakearm/MoveIntakeArmUp.java~Refactor commands and change drivetrain to pid
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.usfirst.frc.team3501.robot.commands.intakearm;
-
-import edu.wpi.first.wpilibj.command.Command;
-
-public class MoveIntakeArmUp extends Command {
-       public MoveIntakeArmUp() {
-       }
-
-       @Override
-       protected void initialize() {
-       }
-
-       @Override
-       protected void execute() {
-       }
-
-       @Override
-       protected boolean isFinished() {
-               return false;
-       }
-
-       @Override
-       protected void end() {
-       }
-
-       @Override
-       protected void interrupted() {
-       }
-
-}