From 16d71de0bcf7caf9dfc600f939ea1ae877eefb60 Mon Sep 17 00:00:00 2001
From: Mike Marchetti <mmarchetti@sandvine.com>
Date: Thu, 5 Oct 2017 11:28:43 -0400
Subject: [PATCH] fix bad merge

Signed-off-by: Mike Marchetti <mmarchetti@sandvine.com>
---
 Jenkinsfile | 1 +
 1 file changed, 1 insertion(+)

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)
+}
-- 
2.17.1