From c37b4828dd1062a2e031344a536bf54147481a95 Mon Sep 17 00:00:00 2001 From: "O.S. Tezer" Date: Sun, 8 Jun 2014 16:03:46 -0700 Subject: [PATCH] Docs: Fix merge issue on docker-hub/builds.md Docker-DCO-1.1-Signed-off-by: O.S. Tezer (github: ostezer) --- docs/sources/docker-hub/builds.md | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/docs/sources/docker-hub/builds.md b/docs/sources/docker-hub/builds.md index 4fbdff2bc0..1d16353990 100644 --- a/docs/sources/docker-hub/builds.md +++ b/docs/sources/docker-hub/builds.md @@ -102,16 +102,9 @@ to Docker Hub. #### 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