From 83e9e94b75f3ad3878ff29fa00fb53eacc077988 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Fri, 9 Jul 2021 12:24:54 -0700 Subject: [PATCH] Merge pull request #103321 from jpbetz/fix-102749-1.19 Manual cherry pick of #103318: Bump SMD to v4.1.2 to pick up #102749 fix Kubernetes-commit: 6ca436bf0801ae96685b7a8daf093f74349b1d83 --- go.mod | 2 -- 1 file changed, 2 deletions(-) diff --git a/go.mod b/go.mod index 1a6bc9c13..619f6fb4c 100644 --- a/go.mod +++ b/go.mod @@ -36,5 +36,3 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.1.2 sigs.k8s.io/yaml v1.2.0 ) - -replace k8s.io/apimachinery => ../apimachinery