From aad9ecde6bf7be183fe598b10d7cb50569ca914e Mon Sep 17 00:00:00 2001
From: Jamie Curnow <jc@jc21.com>
Date: Fri, 1 Mar 2019 20:12:49 +1000
Subject: [PATCH] CI: Prevent having to spin up resources when not Master
 branch

---
 Jenkinsfile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index abd3db30..d4e0da0c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -82,11 +82,7 @@ pipeline {
     }
     stage('Build Master') {
       when {
-<<<<<<< HEAD
         branch 'master'
-=======
-        branch: 'master'
->>>>>>> 0acec1105bb2c29e1e03a81cfb05a6426b3e2a20
       }
       parallel {
         stage('x86_64') {