From fe12a1d10c5e59f60b423aae5cb26ecb89101cb2 Mon Sep 17 00:00:00 2001
From: Mark Bishop <mark@rancher.com>
Date: Tue, 10 Jul 2018 10:15:35 -0700
Subject: [PATCH] undrafting, adding weight

---
 .../rancher/v2.x/en/tasks/workloads/add-a-sidecar/_index.md   | 4 ++++
 1 file changed, 4 insertions(+)

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 a044732e71f..a683cf64bc7 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,6 +1,10 @@
 ---
 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.