Fix conflicts.

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-12-11 17:14:53 -08:00 · 2014-12-11 17:14:53 -08:00 · cb4f91608e
commit cb4f91608e
parent e646feca25
1 changed files with 0 additions and 4 deletions
--- a/docs/registry.go
+++ b/docs/registry.go
@ -47,10 +47,6 @@ func newClient(jar http.CookieJar, roots *x509.CertPool, certs []tls.Certificate
 		tlsConfig.InsecureSkipVerify = true
 	}

-	if !secure {
-		tlsConfig.InsecureSkipVerify = true
-	}
-
 	httpTransport := &http.Transport{
 		DisableKeepAlives: true,
 		Proxy:             http.ProxyFromEnvironment,