Resolve kubernetes docs conflicts

doc/user/project/integrations/kubernetes.md

@@ -19,36 +19,6 @@ for the changes to take effect.
 
 ![Kubernetes configuration settings](img/kubernetes_configuration.png)
 
-<<<<<<< HEAD
-The Kubernetes service takes the following arguments:
-
-1. API URL
-1. Custom CA bundle
-1. Kubernetes namespace
-1. Service token
-
-The API URL is the URL that GitLab uses to access the Kubernetes API. Kubernetes
-exposes several APIs - we want the "base" URL that is common to all of them,
-e.g., `https://kubernetes.example.com` rather than `https://kubernetes.example.com/api/v1`.
-
-A [namespace] is just a logical grouping of resources. This is mostly for ease of
-management, so you can group things together. For example, if you have 50
-projects using the same cluster, providing a simple list of all pods would be
-really difficult to work with. In that case, you can provide a separate
-namespace to group things, as well as reduce name collision issues.
-
-GitLab authenticates against Kubernetes using service tokens, which are
-scoped to a particular `namespace`. If you don't have a service token yet,
-you can follow the
-[Kubernetes documentation](http://kubernetes.io/docs/user-guide/service-accounts/)
-to create one. You can also view or create service tokens in the
-[Kubernetes dashboard](http://kubernetes.io/docs/user-guide/ui/) - visit
-**Config ➔ Secrets**.
-
-Fill in the service token and namespace according to the values you just got.
-If the API is using a self-signed TLS certificate, you'll also need to include
-the `ca.crt` contents as the `Custom CA bundle`.
-=======
 The Kubernetes service takes the following parameters:
 
 - **API URL** -
@@ -76,7 +46,6 @@ The Kubernetes service takes the following parameters:
   to create one. You can also view or create service tokens in the
   [Kubernetes dashboard](https://kubernetes.io/docs/tasks/access-application-cluster/web-ui-dashboard/#config)
   (under **Config > Secrets**).
->>>>>>> upstream/master
 
 [namespace]: https://kubernetes.io/docs/user-guide/namespaces/