mirror of
https://github.com/status-im/consul.git
synced 2025-01-11 06:16:08 +00:00
Resolved merge conflicts
This commit is contained in:
commit
9d57b72e81
@ -433,7 +433,7 @@ func (m *Manager) newProxy(mp *local.ManagedProxy) (Proxy, error) {
|
||||
return nil, fmt.Errorf("error configuring proxy logs: %s", err)
|
||||
}
|
||||
|
||||
// Pass in the environmental variables for this proxy process
|
||||
// Pass in the environmental variables for the proxy process
|
||||
cmd.Env = os.Environ()
|
||||
|
||||
// Build the daemon structure
|
||||
|
Loading…
x
Reference in New Issue
Block a user