From b1547279b382228c1b8cebc8fc6ad30f51fa26fe Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Sun, 14 Feb 2016 16:41:54 -0800 Subject: [PATCH] Delete residual files from merge commits? --- .../intakearm/MoveIntakeArmUp.java~HEAD | 30 ------------------- ...ctor commands and change drivetrain to pid | 30 ------------------- 2 files changed, 60 deletions(-) delete mode 100644 src/org/usfirst/frc/team3501/robot/commands/intakearm/MoveIntakeArmUp.java~HEAD delete mode 100644 src/org/usfirst/frc/team3501/robot/commands/intakearm/MoveIntakeArmUp.java~Refactor commands and change drivetrain to pid 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 index c22bf82d..00000000 --- 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 index bc7b824f..00000000 --- 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() { - } - -} -- 2.30.2