From e7ff7d506bbd1a7a249ab64fad93451a053619c6 Mon Sep 17 00:00:00 2001
From: Kelvin Wang <sherkrainwang@gmail.com>
Date: Fri, 22 Jun 2018 10:48:18 -0700
Subject: [PATCH] fix conflicts

---
 Gopkg.lock | 2 +-
 Gopkg.toml | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index 194bb61e6..243c15fac 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -968,6 +968,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "024194b983d91b9500fe97e0aa0ddb5fe725030cb51ddfb034e386cae1098370"
+  inputs-digest = "ef9c9e12bdc7296af3d450d44966b8ae465e9b845c1409b8027e52998b3c01e0"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index 78d3749a9..64c1762a5 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -108,6 +108,10 @@
   name = "github.com/kballard/go-shellquote"
   branch = "master"
 
+[[constraint]]
+  name = "github.com/kelwang/gojenkins"
+  version = "=v1.0.1"
+
 [[constraint]]
   name = "github.com/matttproud/golang_protobuf_extensions"
   version = "1.0.1"