Fix: newSavedSearchesPagerduty

splunk · May 19, 2023 · 33fa271 · 33fa271
1 parent 64c09ac
commit 33fa271
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/splunk/resource_splunk_saved_searches_test.go b/splunk/resource_splunk_saved_searches_test.go
@@ -441,7 +441,6 @@ func TestAccSplunkSavedSearches(t *testing.T) {
 				),
 			},
 			{
-<<<<<<< HEAD
 				Config: newSavedSearchesPagerduty,
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr(resourceName, "name", "Test Pagerduty Alert"),
@@ -451,8 +450,6 @@ func TestAccSplunkSavedSearches(t *testing.T) {
 				),
 			},
 			{
-=======
->>>>>>> sortigoza-sortigoza/feat/pagerduty-alert
 				Config: newSavedSearchesJiraServiceDesk,
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr(resourceName, "name", "Test Jira Alert Ticket"),