CI: Prevent having to spin up resources when not Master branch

2019-03-01 20:12:49 +10:00 · 2019-03-01 20:12:49 +10:00 · aad9ecde6b
commit aad9ecde6b
parent ae9324295c
1 changed files with 0 additions and 4 deletions
--- a/4
+++ b/4
@ -82,11 +82,7 @@ pipeline {
    }
    stage('Build Master') {
      when {
-<<<<<<< HEAD
        branch 'master'
-=======
-        branch: 'master'
->>>>>>> 0acec1105bb2c29e1e03a81cfb05a6426b3e2a20
      }
      parallel {
        stage('x86_64') {