resolve conflicts in smlogs-plugin

aws · Sep 16, 2022 · 80f9cfb · 80f9cfb
1 parent a0020df
commit 80f9cfb
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 102 deletions.
diff --git a/smlogs-kubectl-plugin/go.mod b/smlogs-kubectl-plugin/go.mod
@@ -4,7 +4,7 @@ go 1.13
 
 require (
 	github.com/aws/amazon-sagemaker-operator-for-k8s v0.0.0
-	github.com/aws/aws-sdk-go-v2 v0.24.0
+	github.com/aws/aws-sdk-go v1.37.3
 	github.com/spf13/cobra v0.0.5
 	github.com/spf13/pflag v1.0.5
 	k8s.io/apimachinery v0.18.19