From adb6a40a59b65f29b4e6adf84cf39cb2e816cbfe Mon Sep 17 00:00:00 2001 From: Mohamed Osman Date: Wed, 9 Nov 2022 14:00:35 -0500 Subject: [PATCH] remove accidental merge conflict references --- obsreport/obsreporttest/otelprometheuschecker_test.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/obsreport/obsreporttest/otelprometheuschecker_test.go b/obsreport/obsreporttest/otelprometheuschecker_test.go index 15639ae6030..18dccd16269 100644 --- 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,