From: Mike Marchetti <mmarchetti@sandvine.com>
Date: Thu, 5 Oct 2017 15:28:43 +0000 (-0400)
Subject: fix bad merge
X-Git-Tag: v3.0.0~1
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=commitdiff_plain;h=16d71de0bcf7caf9dfc600f939ea1ae877eefb60;ds=sidebyside

fix bad merge

Signed-off-by: Mike Marchetti <mmarchetti@sandvine.com>
---

diff --git a/Jenkinsfile b/Jenkinsfile
index ceb06c31f..99cb40523 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -29,3 +29,4 @@ node('docker') {
                            params.GERRIT_PATCHSET_REVISION,
                            params.TEST_INSTALL,
                            params.ARTIFACTORY_SERVER)
+}