Fixed the conflicts

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