From 62754424e03b20a9558a2604e054d0f42be7a783 Mon Sep 17 00:00:00 2001
From: CaoShuFeng <caosf.fnst@cn.fujitsu.com>
Date: Fri, 2 Mar 2018 12:27:50 +0800
Subject: [PATCH] fix description about contribute style guide (#7592)

---
 docs/home/contribute/style-guide.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/home/contribute/style-guide.md b/docs/home/contribute/style-guide.md
index 50432a35ba..fa3d125085 100644
--- a/docs/home/contribute/style-guide.md
+++ b/docs/home/contribute/style-guide.md
@@ -178,11 +178,21 @@ kind: Pod
 A list of Kubernetes-specific terms and words to be used consistently across the site.
 
 <table>
+<<<<<<< HEAD
   <tr><th>Term</th><th>Usage</th></tr>
   <tr><td>Kubernetes</td><td>Kubernetes should always be capitalized.</td></tr>
   <tr><td>Docker</td><td>Docker should always be capitalized.</td></tr>
   <tr><td>SIG Docs</td><td>SIG Docs rather than SIG-DOCS or other variations.</td></tr>
 </table>
+||||||| merged common ancestors
+  <tr><th>Term</th><th>Useage</th></tr>
+  <tr><td>TBD</td><td>TBD</td></tr>
+</table>{% endcomment %}
+=======
+  <tr><th>Term</th><th>Usage</th></tr>
+  <tr><td>TBD</td><td>TBD</td></tr>
+</table>{% endcomment %}
+>>>>>>> fix description about contribute style guide (#7592)
 
 ## Callout Formatting
 Callouts help create different rhetorical appeal levels. Our documentation supports three different callouts: **Note:** {: .note}, **Caution:** {: .caution}, and **Warning:** {: .warning}.