From 4167c6f18ac3a133c9485989efa535f5a927999b Mon Sep 17 00:00:00 2001
From: Jacob Bednarz <jacob.bednarz@gmail.com>
Date: Thu, 5 Dec 2024 11:12:12 +1100
Subject: [PATCH] fix conflict markers

---
 internal/framework/provider/provider.go | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/internal/framework/provider/provider.go b/internal/framework/provider/provider.go
index aa7c167031..afe4903201 100644
--- 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)
 	}
 }