fixed rebase errors

edmondceausu · edmondceausu · commit 632280cff60e · 2025-06-16T11:23:41.000Z
diff --git a/pkg/cloud/services/eks/addons.go b/pkg/cloud/services/eks/addons.go
@@ -237,11 +237,7 @@ func convertConflictResolution(conflict ekscontrolplanev1.AddonResolution) (*str
 
 	// Defaulting to behavior "Overwrite" as documented
 	default:
-<<<<<<< HEAD
 		return aws.String(string(ekstypes.ResolveConflictsOverwrite)), fmt.Errorf("failed to determine adddonResolution; defaulting to Overwrite")
-=======
-		return aws.String(eks.ResolveConflictsOverwrite), fmt.Errorf("failed to determine adddonResolution; defaulting to Overwrite")
->>>>>>> 820ee8734 (updated documentation and code to reflect kubebuilder behavior)
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -237,11 +237,7 @@ func convertConflictResolution(conflict ekscontrolplanev1.AddonResolution) (*str`
`237`	`237`
`238`	`238`	`// Defaulting to behavior "Overwrite" as documented`
`239`	`239`	`default:`
`240`		`-<<<<<<< HEAD`
`241`	`240`	`return aws.String(string(ekstypes.ResolveConflictsOverwrite)), fmt.Errorf("failed to determine adddonResolution; defaulting to Overwrite")`
`242`		`-=======`
`243`		`- return aws.String(eks.ResolveConflictsOverwrite), fmt.Errorf("failed to determine adddonResolution; defaulting to Overwrite")`
`244`		`->>>>>>> 820ee8734 (updated documentation and code to reflect kubebuilder behavior)`
`245`	`241`	`}`
`246`	`242`	`}`
`247`	`243`