解决冲突

TsingJyujing · Dec 6, 2018 · cc0f97c · cc0f97c
2 parents e2b6e68 + c224a47
commit cc0f97c
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 100 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+target/
diff --git a/README.md b/README.md
@@ -36,7 +36,6 @@ Building Chinese Resume
 - 修改使用的字体（你可以根据自己的需要调整编译的字体）
 - 减少行间距使得布局更加紧凑：`\setlength{\parskip}{4pt}`
 - 增加对表和紧凑列表的支持
-
 ```latex
 \usepackage{booktabs}
 \providecommand{\tightlist}{%

diff --git a/ResumeForOpenSourceCommuni.md b/ResumeForOpenSourceCommuni.md