Skip to content
Snippets Groups Projects
Commit eea692c1 authored by Matthias Loibl's avatar Matthias Loibl
Browse files

Update kube-prometheus self-dependency

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