Docs: Fix merge issue on docker-hub/builds.md
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
This commit is contained in:
parent
23bdb3b3a6
commit
c37b4828dd
|
@ -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](
|
||||||
You can [create an Automated
|
https://registry.hub.docker.com/builds/bitbucket/select/) from any of your
|
||||||
Build](https://index.docker.io/builds/bitbucket/select/) from any of
|
public or private BitBucket repositories with a `Dockerfile`.
|
||||||
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
|
|
||||||
|
|
||||||
### The Dockerfile and Automated Builds
|
### The Dockerfile and Automated Builds
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue