Skip to content
Snippets Groups Projects
Commit f4d7270c authored by Josh Tilles's avatar Josh Tilles
Browse files

Update kube-prometheus self-dependency

parent df8a5b51
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 5 deletions
jsonnetfile.lock.json
+ 1
− 5
View file @ f4d7270c
...@@ -8,11 +8,7 @@ ...@@ -8,11 +8,7 @@
"subdir": "jsonnet/kube-prometheus" "subdir": "jsonnet/kube-prometheus"
} }
}, },
<<<<<<< HEAD "version": "df8a5b51b4e05fc7ba1a168346a80cbc9bec48d3"
"version": "107028fff38b6e3dce3e1ef110222474fb01b31c"
=======
"version": "e85d2f3b64c65f81aec7093dda880376a6719fe1"
>>>>>>> release-0.1
}, },
{ {
"name": "ksonnet", "name": "ksonnet",
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment