fix conflict markers

cloudflare · Dec 5, 2024 · 4167c6f · 4167c6f
1 parent 35b9619
commit 4167c6f
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/internal/framework/provider/provider.go b/internal/framework/provider/provider.go
@@ -389,11 +389,8 @@ func (p *CloudflareProvider) Resources(ctx context.Context) []func() resource.Re
 		zero_trust_risk_score_integration.NewResource,
 		infrastructure_access_target_deprecated.NewResource,
 		zero_trust_infrastructure_access_target.NewResource,
-<<<<<<< HEAD
 		leaked_credential_check.NewResource,
-=======
 		leaked_credential_check_rules.NewResource,
->>>>>>> 9769fdf5b (Add new resource to provider)
 	}
 }