From 86c1df4d954faf00a27a02f81f5cbae364545da1 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Thu, 12 Jul 2018 13:03:50 -0700 Subject: [PATCH] removed git conflict resolution text --- .../rancher/v2.x/en/tasks/workloads/add-a-sidecar/_index.md | 4 ---- .../en/config-options/add-ons/ingress-controllers/_index.md | 4 ---- 2 files changed, 8 deletions(-) diff --git a/content/rancher/v2.x/en/tasks/workloads/add-a-sidecar/_index.md b/content/rancher/v2.x/en/tasks/workloads/add-a-sidecar/_index.md index a683cf64bc7..a044732e71f 100644 --- a/content/rancher/v2.x/en/tasks/workloads/add-a-sidecar/_index.md +++ b/content/rancher/v2.x/en/tasks/workloads/add-a-sidecar/_index.md @@ -1,10 +1,6 @@ --- title: Adding a Sidecar -<<<<<<< HEAD weight: 200 -======= -weight: ->>>>>>> undrafting, adding weight --- A _sidecar_ is a container that extends or enhances the main container in a pod. The main container and the sidecar share a pod, and therefore share the same network space and storage. You can add sidecars to existing workloads by using the **Add a Sidecar** option. diff --git a/content/rke/v0.1.x/en/config-options/add-ons/ingress-controllers/_index.md b/content/rke/v0.1.x/en/config-options/add-ons/ingress-controllers/_index.md index 90c01a4b789..bcd3ed5ee3a 100644 --- a/content/rke/v0.1.x/en/config-options/add-ons/ingress-controllers/_index.md +++ b/content/rke/v0.1.x/en/config-options/add-ons/ingress-controllers/_index.md @@ -39,11 +39,7 @@ ingress: ``` ## Configuring NGINX Ingress Controller -<<<<<<< HEAD For the configuration of nginx, there are configuration options available in Kubernetes. There are a [list of options for the NGINX config map](https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/configmap.md) , [command line extra_args](https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/cli-arguments.md) and [annotations](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/annotations/). -======= -For the configuration of nginx, there are some configuration options. There are a [list of options](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/configmap/) for the nginx config map and [command line extra_args](https://kubernetes.github.io/ingress-nginx/user-guide/cli-arguments/). ->>>>>>> nginx references ```yaml ingress: