Update receiver_test.go

elastic · Jan 3, 2025 · b293478 · b293478
1 parent 6161014
commit b293478
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/x-pack/filebeat/fbreceiver/receiver_test.go b/x-pack/filebeat/fbreceiver/receiver_test.go
@@ -89,8 +89,6 @@ found:
 	err = r.Shutdown(context.Background())
 	assert.NoError(t, err, "Error shutting down filebeatreceiver")
 }
-<<<<<<< HEAD
-=======
 
 func BenchmarkFactory(b *testing.B) {
 	tmpDir := b.TempDir()
@@ -135,4 +133,3 @@ func BenchmarkFactory(b *testing.B) {
 		require.NoError(b, err)
 	}
 }
->>>>>>> 1430cfda7 (Fix Otel API change and update system test golden files to 2025 (#42199))