Commit d25da664 authored by Steve Azzopardi's avatar Steve Azzopardi

Resolve conflicts in doc/user/project/clusters/index.md

Resolve conflicts for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8478
parent 3960cdb9
......@@ -421,13 +421,8 @@ When [Prometheus is deployed](#installing-applications), GitLab will automatical
After you have successfully added your cluster information, you can enable the
Kubernetes cluster integration:
<<<<<<< HEAD
1. Click the "Enabled/Disabled" switch
1. Hit **Save** for the changes to take effect
=======
1. Click the **Enabled/Disabled** switch
1. Hit **Save** for the changes to take effect
>>>>>>> upstream/master
You can now start using your Kubernetes cluster for your deployments.
......
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