Remove extra ksonnet4 dependency

2019-05-29 17:39:14 +02:00
parent 2e4b89b091
commit 107028fff3
18 changed files with 21 additions and 37 deletions
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -8,7 +8,11 @@
                    "subdir": "jsonnet/kube-prometheus"
                }
            },
+<<<<<<< HEAD
            "version": "bedeadb7f5686537b7733096dcbb86ab0f722ce8"
+=======
+            "version": "c5c70e2101c29818d350a3b90ae0e417a5602507"
+>>>>>>> Remove extra ksonnet4 dependency
        },
        {
            "name": "ksonnet",
@@ -18,17 +22,7 @@
                    "subdir": ""
                }
            },
-            "version": "d03da231d6c8bd74437b74a1e9e8b966f13dffa2"
-        },
-        {
-            "name": "ksonnet4",
-            "source": {
-                "git": {
-                    "remote": "https://github.com/metalmatze/ksonnet-lib",
-                    "subdir": ""
-                }
-            },
-            "version": "3e10db7d0dce7c175ac03be631001489b5578744"
+            "version": "0d2f82676817bbf9e4acf6495b2090205f323b9f"
        },
        {
            "name": "kubernetes-mixin",