Skip to content

G
gitlab-ce
Commit d07ee671 authored by Thong Kuah's avatar Thong Kuah
Browse files
Options

Fix conflict in doc/user/project/clusters/index.md

parent d033f5df
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
doc/user/project/clusters/index.md
View file @ d07ee671
...@@ -461,7 +461,6 @@ builds is that they must have a matching ...@@ -461,7 +461,6 @@ builds is that they must have a matching
your build has no `environment:name` set, it will not be passed the Kubernetes your build has no `environment:name` set, it will not be passed the Kubernetes
credentials. credentials.
<<<<<<< HEAD
## Monitoring your Kubernetes cluster **[ULTIMATE]** ## Monitoring your Kubernetes cluster **[ULTIMATE]**
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4701) in [GitLab Ultimate][ee] 10.6. > [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4701) in [GitLab Ultimate][ee] 10.6.
...@@ -470,8 +469,6 @@ When [Prometheus is deployed](#installing-applications), GitLab will automatical ...@@ -470,8 +469,6 @@ When [Prometheus is deployed](#installing-applications), GitLab will automatical
![Cluster Monitoring](img/k8s_cluster_monitoring.png) ![Cluster Monitoring](img/k8s_cluster_monitoring.png)
=======
>>>>>>> upstream/master
## Enabling or disabling the Kubernetes cluster integration ## Enabling or disabling the Kubernetes cluster integration
After you have successfully added your cluster information, you can enable the After you have successfully added your cluster information, you can enable the
......
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