Merge pull request #93811 from liggitt/json-patch-4.8.0-1.18

[1.18] Update to json-patch 4.8.0 Kubernetes-commit: 7914bac28a993d4493e0c1e31323bb9330dbdcf6
kubernetes · Aug 12, 2020 · 2a28283 · 2a28283
1 parent d71a682
commit 2a28283
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/go.mod b/go.mod
@@ -40,5 +40,4 @@ require (
 replace (
 	golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13
 	golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
-	k8s.io/apimachinery => ../apimachinery
 )