up

taotao19131 · Sep 17, 2018 · d9a38fc · d9a38fc
1 parent 9650cdd
commit d9a38fc
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/README.md b/README.md
@@ -10,13 +10,9 @@
 <img src="https://img.shields.io/badge/language-JavaScript-yellow.svg">
 <a href=""><img src="https://img.shields.io/badge/license-Apache--2.0-000000.svg"></a>
 <a href="https://loveincode.cnblogs.com/"><img src="https://img.shields.io/badge/Blog-loveincode-80d4f9.svg?style=flat"></a>
-<<<<<<< HEAD
-</p> 
-=======
 </p>
->>>>>>> 03cfb2a8e67fb04582c1ccdf9cd92e82d05c6c04
 
-    Java后端工程师的学习技术栈 有你想要的
+   Java后端工程师的学习技术栈
 
    [Java程序员的链接库](https://github.com/loveincode/notes/blob/master/%E6%94%B6%E8%97%8F/%E5%A5%BD%E9%93%BE%E6%8E%A5.md)