rebase fixes

everettraven · everettraven · commit dcd37f04daed · 2024-08-02T10:34:34.000-04:00
Signed-off-by: everettraven &lt;everettraven@gmail.com&gt;
diff --git a/internal/controllers/clusterextension_controller.go b/internal/controllers/clusterextension_controller.go
@@ -421,7 +421,6 @@ func clusterExtensionRequestsForCatalog(c client.Reader, logger logr.Logger) crh
 	}
 }
 
-
 type DefaultInstalledBundleGetter struct {
 	helmclient.ActionClientGetter
 }

Original file line number	Diff line number	Diff line change
`@@ -421,7 +421,6 @@ func clusterExtensionRequestsForCatalog(c client.Reader, logger logr.Logger) crh`
`421`	`421`	`}`
`422`	`422`	`}`
`423`	`423`
`424`		`-`
`425`	`424`	`type DefaultInstalledBundleGetter struct {`
`426`	`425`	`helmclient.ActionClientGetter`
`427`	`426`	`}`