From 7bb687ce647c91af28b437731eacfb0ebde8cac8 Mon Sep 17 00:00:00 2001
From: Megan Marsh <megan@hashicorp.com>
Date: Wed, 29 Aug 2018 14:05:29 -0700
Subject: [PATCH] fix mistake in vendor.json

---
 vendor/vendor.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/vendor/vendor.json b/vendor/vendor.json
index 68a4dc055..6f419bdf1 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -1100,7 +1100,6 @@
 			"path": "github.com/hashicorp/vault/helper/strutil",
 			"revision": "b9adaf9c695966639d4c358efe2d132f5ff232ab",
 			"revisionTime": "2018-07-24T21:50:49Z"
->>>>>>> add template function allowing user to read keys from vault
 		},
 		{
 			"checksumSHA1": "Gm2k+46HxKqsjI8lCWBp/jRaPrM=",