resolve conflict

27afdab1 · WuHaobo · 2f0cf6e9 · 27afdab1
显示空白变更内容
内联并排

Showing with 0 addition and 1 deletion

docs/zh_CN/conf.py docs/zh_CN/conf.py +0 -1

未找到文件。
--- a/docs/zh_CN/conf.py
+++ b/docs/zh_CN/conf.py
@@ -11,7 +11,6 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 import os
-# import sys
 import recommonmark

 exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']