From 6cab82306eb3d14470619649b610fca7a6c54b2c Mon Sep 17 00:00:00 2001
From: Nikhita Raghunath <nikitaraghunath@gmail.com>
Date: Wed, 5 Dec 2018 22:03:41 +0530
Subject: [PATCH] kube-apiserver: remove merge conflict marker (#11543)

---
 .../command-line-tools-reference/kube-apiserver.md         | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/content/en/docs/reference/command-line-tools-reference/kube-apiserver.md b/content/en/docs/reference/command-line-tools-reference/kube-apiserver.md
index 73359207da..4b7e3d374b 100644
--- a/content/en/docs/reference/command-line-tools-reference/kube-apiserver.md
+++ b/content/en/docs/reference/command-line-tools-reference/kube-apiserver.md
@@ -567,7 +567,6 @@ kube-apiserver [flags]
     </tr>
 
     <tr>
-<<<<<<< HEAD
       <td colspan="2">--encryption-provider-config string</td>
     </tr>
     <tr>
@@ -575,8 +574,6 @@ kube-apiserver [flags]
     </tr>
 
     <tr>
-=======
->>>>>>> Generate copmonents and tools reference
       <td colspan="2">--external-hostname string</td>
     </tr>
     <tr>
@@ -937,11 +934,7 @@ kube-apiserver [flags]
       <td colspan="2">--storage-backend string</td>
     </tr>
     <tr>
-<<<<<<< HEAD
       <td></td><td style="line-height: 130%; word-wrap: break-word;">The storage backend for persistence. Options: 'etcd3' (default)</td>
-=======
-      <td></td><td style="line-height: 130%; word-wrap: break-word;">The storage backend for persistence. Options: 'etcd3' (default).</td>
->>>>>>> Generate copmonents and tools reference
     </tr>
 
     <tr>