From f4d7270c53d1fbcc14dc2421a4de89f56d85b176 Mon Sep 17 00:00:00 2001
From: Josh Tilles <MerelyAPseudonym@gmail.com>
Date: Mon, 10 Jun 2019 14:48:06 -0400
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 d2c3105f..b05fa914 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -8,11 +8,7 @@
"subdir": "jsonnet/kube-prometheus"
}
},
-<<<<<<< HEAD
- "version": "107028fff38b6e3dce3e1ef110222474fb01b31c"
-=======
- "version": "e85d2f3b64c65f81aec7093dda880376a6719fe1"
->>>>>>> release-0.1
+ "version": "df8a5b51b4e05fc7ba1a168346a80cbc9bec48d3"
},
{
"name": "ksonnet",
--
GitLab