Browse Source

Docs: Fix merge issue on docker-hub/builds.md

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
O.S. Tezer 11 years ago
parent
commit
c37b4828dd
1 changed files with 3 additions and 10 deletions
  1. 3 10
      docs/sources/docker-hub/builds.md

+ 3 - 10
docs/sources/docker-hub/builds.md

@@ -102,16 +102,9 @@ to Docker Hub.
 
 
 #### Creating an Automated Build
 #### Creating an Automated Build
 
 
-<<<<<<< HEAD:docs/sources/docker-io/builds.md
-You can [create an Automated
-Build](https://index.docker.io/builds/bitbucket/select/) from any of
-your public or private BitBucket repositories with a `Dockerfile`.
-=======
-You can [create a Trusted
-Build](https://registry.hub.docker.com/builds/bitbucket/select/)
-from any of your public or private BitBucket repositories with a
-`Dockerfile`.
->>>>>>> Initial links:docs/sources/docker-hub/builds.md
+You can [create an Automated Build](
+https://registry.hub.docker.com/builds/bitbucket/select/) from any of your
+public or private BitBucket repositories with a `Dockerfile`.
 
 
 ### The Dockerfile and Automated Builds
 ### The Dockerfile and Automated Builds