Merge branch 'develop' of github.com:jc21/nginx-proxy-manager into develop

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