Fixed merging issues

Signed-off-by: mholder6 <[email protected]>
opendatahub-io · Jul 30, 2024 · ed10ad1 · ed10ad1
1 parent 311f3eb
commit ed10ad1
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 266 deletions.
diff --git a/.gitignore b/.gitignore
@@ -75,6 +75,3 @@ docker-compose.yml
 
 # Istio installer downloaded by quick install
 istio-*
-
-#Notes on how different versions of the repo
-instructions
diff --git a/go.mod b/go.mod
@@ -58,11 +58,8 @@ require (
 	github.com/evanphx/json-patch/v5 v5.7.0 // indirect
 	github.com/go-kit/log v0.2.1 // indirect
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
-<<<<<<< HEAD
-	github.com/go-logr/zapr v1.3.0 // indirect
-=======
 	github.com/go-logr/stdr v1.2.2 // indirect
->>>>>>> ec46492d (Updated istio versions based on go version 1.21)
+	github.com/go-logr/zapr v1.3.0 // indirect
 	github.com/go-openapi/jsonpointer v0.20.0 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
 	github.com/go-openapi/swag v0.22.4 // indirect