Skip to content

Commit

Permalink
[JENKINS-33382] Resolve more conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
armfergom committed Mar 31, 2016
1 parent 2fef61f commit 7e4f105
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions src/main/java/org/jenkinsci/test/acceptance/po/Job.java
Expand Up @@ -150,12 +150,6 @@ public ShellBuildStep addShellStep(String shell) {
step.command(shell);
return step;
}

private BatchBuildStep addBatchStep(String batch) {
BatchBuildStep step = addBuildStep(BatchBuildStep.class);
step.command(batch);
return step;
}

public BatchCommandBuildStep addBatchStep(String batch) {
BatchCommandBuildStep step = addBuildStep(BatchCommandBuildStep.class);
Expand Down

0 comments on commit 7e4f105

Please sign in to comment.