From cb4f91608e945a8cb370c1324a193cd36b49aad1 Mon Sep 17 00:00:00 2001
From: Jessica Frazelle <jess@docker.com>
Date: Thu, 11 Dec 2014 17:14:53 -0800
Subject: [PATCH] Fix conflicts.

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
---
 docs/registry.go | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/registry.go b/docs/registry.go
index f3a4a340b..d503a63d6 100644
--- 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,