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

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