remove accidental merge conflict references

open-telemetry · Nov 9, 2022 · adb6a40 · adb6a40
1 parent 3436c45
commit adb6a40
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/obsreport/obsreporttest/otelprometheuschecker_test.go b/obsreport/obsreporttest/otelprometheuschecker_test.go
@@ -47,14 +47,9 @@ func TestPromChecker(t *testing.T) {
 	pc, err := newStubPromChecker()
 	require.NoError(t, err)
 
-<<<<<<< HEAD
-	receiver := component.NewID("fakeReceiver")
-	exporter := component.NewID("fakeExporter")
-=======
 	scraper := config.NewComponentID("fakeScraper")
 	receiver := config.NewComponentID("fakeReceiver")
 	exporter := config.NewComponentID("fakeExporter")
->>>>>>> bdc7135b (fix typo add testing for checkScraperMetrics)
 	transport := "fakeTransport"
 
 	assert.NoError(t,