status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix conflict in merged PRs 

One PR renamed the var from config->cfg, and another used the old name config, which caused the
build to fail on master.
This commit is contained in:
Daniel Nephin 2020-08-13 11:28:26 -04:00
parent d677706625
commit 8f596f5551
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/agent.go
View File

@ -510,7 +510,7 @@ func New(options ...AgentOption) (*Agent, error) {
// Retrieve or generate the node ID before setting up the rest of the // Retrieve or generate the node ID before setting up the rest of the
// agent, which depends on it. // agent, which depends on it.
config.NodeID, err = newNodeIDFromConfig(a.config, a.logger) cfg.NodeID, err = newNodeIDFromConfig(a.config, a.logger)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to setup node ID: %w", err) return nil, fmt.Errorf("failed to setup node ID: %w", err)
} }