remove merge artifact

snapcore · Jun 6, 2017 · fb5bcbc · fb5bcbc
1 parent e5eb777
commit fb5bcbc
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/vendor/vendor.json b/vendor/vendor.json
@@ -48,12 +48,6 @@
 			"revision": "0c0cd2628b36f2b053b7cc1ec04b76aab4c5189c",
 			"revisionTime": "2017-05-27T09:53:06Z"
 		},
-		{
-			"checksumSHA1": "tZT9rWgTJ61Y5VdqSCF9B3404mU=",
-			"path": "github.com/mvo5/uboot-go/uenv",
-			"revision": "256976a42706934b027729183e3a5af2ae646502",
-			"revisionTime": "2017-05-16T08:01:36Z"
-		},
 		{
 			"checksumSHA1": "lG6diF/yE9cGgQIKRAlsaeYAjO4=",
 			"path": "github.com/ojii/gettext.go",