Resolved merge conflicts

2018-07-09 12:48:34 -04:00 · 2018-07-09 12:48:34 -04:00 · 3a00c5a834
parent 0b50b84429 e79f630adf
commit 3a00c5a834
1 changed files with 1 additions and 1 deletions
--- a/agent/proxy/manager.go
+++ b/agent/proxy/manager.go
@ -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