From ac42a5531c3bd0bf6ff408747091dacb8dbed5ac Mon Sep 17 00:00:00 2001
From: Brian Moyles <157126600+BrianMoyles@users.noreply.github.com>
Date: Thu, 18 Jul 2024 10:04:25 +0100
Subject: [PATCH] Update tf_exporter_resource_test.go

---
 genesyscloud/tfexporter/tf_exporter_resource_test.go | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/genesyscloud/tfexporter/tf_exporter_resource_test.go b/genesyscloud/tfexporter/tf_exporter_resource_test.go
index 00074bdbb..19364f3ef 100644
--- a/genesyscloud/tfexporter/tf_exporter_resource_test.go
+++ b/genesyscloud/tfexporter/tf_exporter_resource_test.go
@@ -315,11 +315,8 @@ func (r *registerTestInstance) registerTestExporters() {
 func (r *registerTestInstance) registerTestDataSources() {
 	providerDataSources["genesyscloud_auth_division_home"] = gcloud.DataSourceAuthDivisionHome()
 	providerDataSources["genesyscloud_script"] = scripts.DataSourceScript()
-<<<<<<< HEAD
 	providerDataSources["genesyscloud_telephony_providers_edges_site"] = edgeSite.DataSourceSite()
-=======
 	providerDataSources["genesyscloud_conversations_messaging_settings"] = cMessagingSettings.DataSourceConversationsMessagingSettings()
->>>>>>> 05174038 (Created Resource & added tests)
 }
 
 func RegisterExporter(exporterName string, resourceExporter *resourceExporter.ResourceExporter) {