Cleaning up borked rebase.

jenkinsci · Jan 27, 2017 · e175bde · e175bde
1 parent 2ea45d6
commit e175bde
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/...efinition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/ValidatorTest.java b/...efinition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/ValidatorTest.java
@@ -496,15 +496,14 @@ public void badPostContent() throws Exception {
     }
 
     @Test
-<<<<<<< HEAD
     public void duplicateOptionAndTriggerNames() throws Exception {
         expectError("duplicateOptionAndTriggerNames")
                 .logContains(Messages.ModelValidatorImpl_DuplicateOptionName("skipDefaultCheckout"),
                         Messages.ModelValidatorImpl_DuplicateTriggerName("cron"))
                 .go();
     }
 
-=======
+    @Test
     public void parallelStagesAndSteps() throws Exception {
         expectError("parallelStagesAndSteps")
                 .logContains(Messages.ModelValidatorImpl_BothStagesAndSteps("foo"))
@@ -518,5 +517,4 @@ public void parallelStagesAgentTools() throws Exception {
                         Messages.ModelValidatorImpl_ToolsInNestedStages("foo"))
                 .go();
     }
->>>>>>> Added some actual testing of parallelism syntax!
 }