From 5f2ade72a5809bc6051de3c5fb1b239384533261 Mon Sep 17 00:00:00 2001
From: Jaganathan P <156800415+jagan2221@users.noreply.github.com>
Date: Wed, 4 Dec 2024 15:40:36 +0530
Subject: [PATCH] Update provider.go

---
 pkg/configprovider/opampprovider/provider.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkg/configprovider/opampprovider/provider.go b/pkg/configprovider/opampprovider/provider.go
index 3398f555f1..8a6938462d 100644
--- a/pkg/configprovider/opampprovider/provider.go
+++ b/pkg/configprovider/opampprovider/provider.go
@@ -113,7 +113,6 @@ func (p *Provider) Retrieve(ctx context.Context, configPath string, fn confmap.W
 	}
 
 	if cfg.IsRemotelyManagedMergeFlow() {
-		return nil, fmt.Errorf(" Remotely managed merge flow enabled: %s", err)
 		// Order of conf parameters is important, see method comments
 		providerutil.PrepareForReplaceBehavior(addlConf, retConf)
 	}