Skip to content

G
gitlab-ce
Commit c416d3c0 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis
Browse files
Options

Resolve doc conflict

parent 842f00b8
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
doc/ci/README.md
View file @ c416d3c0
...@@ -73,11 +73,8 @@ learn how to leverage its potential even more. ...@@ -73,11 +73,8 @@ learn how to leverage its potential even more.
- [Trigger pipelines on a schedule](../user/project/pipelines/schedules.md) - [Trigger pipelines on a schedule](../user/project/pipelines/schedules.md)
- [Kubernetes clusters](../user/project/clusters/index.md) - Integrate one or - [Kubernetes clusters](../user/project/clusters/index.md) - Integrate one or
more Kubernetes clusters to your project more Kubernetes clusters to your project
<<<<<<< HEAD
- [Deploy Boards](../user/project/deploy_boards.md) - Check the current health - [Deploy Boards](../user/project/deploy_boards.md) - Check the current health
and status of each CI/CD environment running on Kubernetes and status of each CI/CD environment running on Kubernetes
=======
>>>>>>> upstream/master
## GitLab CI/CD for Docker ## GitLab CI/CD for Docker
......
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