Skip to content

G
gitlab-ce
Commit bc70f4ee authored by Luke Bennett's avatar Luke Bennett
Browse files
Options

Resolve index.md

parent 6d5aee9d
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
doc/ci/autodeploy/index.md
View file @ bc70f4ee
...@@ -37,11 +37,7 @@ during the deployment. ...@@ -37,11 +37,7 @@ during the deployment.
We made a [simple guide](quick_start_guide.md) to using Auto Deploy with GitLab.com. We made a [simple guide](quick_start_guide.md) to using Auto Deploy with GitLab.com.
<<<<<<< HEAD
For a demonstration of GitLab Auto Deploy, read the blog post [Auto Deploy from GitLab to an OpenShift Container Cluster](https://about.gitlab.com/2017/05/16/devops-containers-gitlab-openshift/). For a demonstration of GitLab Auto Deploy, read the blog post [Auto Deploy from GitLab to an OpenShift Container Cluster](https://about.gitlab.com/2017/05/16/devops-containers-gitlab-openshift/).
=======
For a demonstration of GitLab Auto Deploy, read the blog post [Auto Deploy from GitLab to an OpenShift Container Cluster](https://about.gitlab.com/2017/05/16/devops-containers-gitlab-openshift/)
>>>>>>> upstream/master
## Supported templates ## Supported templates
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7