From 27afdab12bef91f743274bf4639cf3c8c12b8b57 Mon Sep 17 00:00:00 2001
From: WuHaobo <wuhaobo1994@gmail.com>
Date: Mon, 13 Apr 2020 20:57:33 +0800
Subject: [PATCH] resolve conflict

---
 docs/zh_CN/conf.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/zh_CN/conf.py b/docs/zh_CN/conf.py
index 13d8844bc..165295079 100644
--- 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']