Skip to content

Commit

Permalink
Update provider.go
Browse files Browse the repository at this point in the history
  • Loading branch information
jagan2221 authored Dec 4, 2024
1 parent f213f26 commit 5f2ade7
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion pkg/configprovider/opampprovider/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down

0 comments on commit 5f2ade7

Please sign in to comment.