kubernetes
/
website
mirror of https://github.com/kubernetes/website.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

kube-apiserver: remove merge conflict marker (#11543)

pull/11549/head
Nikhita Raghunath 2018-12-05 22:03:41 +05:30 committed by Kubernetes Prow Robot
parent cd04d3ff71
commit 6cab82306e
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
content/en/docs/reference/command-line-tools-reference/kube-apiserver.md
View File

@ -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>