update readme.md

lee4755026 · Jun 14, 2019 · 8ee4f6d · 8ee4f6d
1 parent 8b0f3b1
commit 8ee4f6d
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -600,7 +600,6 @@ mail1
 
 **99\. CommonsenseQA：面向常识的英文QA挑战** [link](https://www.tau-nlp.org/commonsenseqa)
 
-<<<<<<< HEAD
 **100\. 中文知识图谱资料、数据及工具** [github](https://github.com/husthuke/awesome-knowledge-graph)
 
 **101\. 各大公司内部里大牛分享的技术文档 PDF 或者 PPT** [github](https://github.com/0voice/from_coder_to_expert)
@@ -638,6 +637,4 @@ mail1
 
 
 
-=======
->>>>>>> 4f0c5ae77eccd6d4388fe8f1596775f8ef53c8a6