summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXingcai Zhang <zhangxingcai@ghostcloud.cn>2017-10-21 21:48:54 +0800
committerXingcai Zhang <zhangxingcai@ghostcloud.cn>2017-10-21 21:48:54 +0800
commit97ac88ce91b17a51fe052c80935869fa14ed4832 (patch)
treebe1235d96fb034148c68c5abd572d848b3b61b94
parent9f0e4610a32c598450b38744531d28578e88dfa8 (diff)
update word conflicts
-rw-r--r--contributors/design-proposals/architecture/1-kubernetes-enhancement-proposal-process.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/contributors/design-proposals/architecture/1-kubernetes-enhancement-proposal-process.md b/contributors/design-proposals/architecture/1-kubernetes-enhancement-proposal-process.md
index ecea9a00..b9a0e645 100644
--- a/contributors/design-proposals/architecture/1-kubernetes-enhancement-proposal-process.md
+++ b/contributors/design-proposals/architecture/1-kubernetes-enhancement-proposal-process.md
@@ -172,7 +172,7 @@ Metadata items:
pre-acceptance KEPs.
* On acceptance a sequential dense number will be assigned. This will be done
by the editor and will be done in such a way as to minimize the chances of
- conficts. The final number for a KEP will have no prefix.
+ conflicts. The final number for a KEP will have no prefix.
* **title** Required
* The title of the KEP in plain language. The title will also be used in the
KEP filename. See the template for instructions and details.