From eea692c1909e3e17cb030a1fbf03d82c69457b55 Mon Sep 17 00:00:00 2001
From: Matthias Loibl <mail@matthiasloibl.com>
Date: Wed, 29 May 2019 17:56:09 +0200
Subject: [PATCH] Update kube-prometheus self-dependency
---
jsonnetfile.lock.json | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index c0b39673..8512ebf0 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -8,11 +8,7 @@
"subdir": "jsonnet/kube-prometheus"
}
},
-<<<<<<< HEAD
- "version": "bedeadb7f5686537b7733096dcbb86ab0f722ce8"
-=======
- "version": "c5c70e2101c29818d350a3b90ae0e417a5602507"
->>>>>>> Remove extra ksonnet4 dependency
+ "version": "107028fff38b6e3dce3e1ef110222474fb01b31c"
},
{
"name": "ksonnet",
--
GitLab