From 601b9276f042b9ef74475dfbc1a4a087c515b1bf Mon Sep 17 00:00:00 2001
From: Naveen <nsrinivasan1976@gmail.com>
Date: Thu, 4 Aug 2016 21:28:38 -0400
Subject: [PATCH] Fixed the conflicts

---
 docs/user-guide/configmap/index.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/user-guide/configmap/index.md b/docs/user-guide/configmap/index.md
index 59374851ac..7b5cd452fc 100644
--- a/docs/user-guide/configmap/index.md
+++ b/docs/user-guide/configmap/index.md
@@ -1,4 +1,8 @@
 ---
+assignees:
+- eparis
+- pmorie
+
 ---
 Many applications require configuration via some combination of config files, command line
 arguments, and environment variables.  These configuration artifacts should be decoupled from image
@@ -362,7 +366,7 @@ spec:
   containers:
     - name: test-container
       image: gcr.io/google_containers/busybox
-      command: [ "/bin/sh", "-c" , "cat /etc/config/special.how" ]
+      command: [ "/bin/sh", "-c", "cat /etc/config/special.how" ]
       volumeMounts:
       - name: config-volume
         mountPath: /etc/config
@@ -390,7 +394,7 @@ spec:
   containers:
     - name: test-container
       image: gcr.io/google_containers/busybox
-      command: [ "/bin/sh", "-c" , "cat /etc/config/path/to/special-key" ]
+      command: [ "/bin/sh","-c","cat /etc/config/path/to/special-key" ]
       volumeMounts:
       - name: config-volume
         mountPath: /etc/config