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

jc21 · jc21 · commit aad9ecde6bf7 · 2019-03-01T20:12:49.000+10:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -82,11 +82,7 @@ pipeline {
     }
     stage('Build Master') {
       when {
-<<<<<<< HEAD
         branch 'master'
-=======
-        branch: 'master'
->>>>>>> 0acec1105bb2c29e1e03a81cfb05a6426b3e2a20
       }
       parallel {
         stage('x86_64') {
