增加项目依赖

jukanntenn · Jun 15, 2017 · f7d0ef7 · f7d0ef7
1 parent 49aec8c
commit f7d0ef7
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -1,11 +1,7 @@
 django==1.10.6
 Markdown==2.6.8
 Pygments==2.2.0
-<<<<<<< HEAD
-pytz==2016.10
-=======
 pytz==2016.10
 django-haystack==2.6.1
 jieba==0.38
 Whoosh==2.7.4
->>>>>>> demo