修复冲突

Baiang · May 11, 2016 · 157e3d6 · 157e3d6
1 parent c02f4ea
commit 157e3d6
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/README.md b/README.md
@@ -1,11 +1,6 @@
-dfy
-==========================
+# dfy
 
-<<<<<<< HEAD
 [![npm](https://img.shields.io/npm/v/npm.svg?maxAge=2592000)]()[![Github Releases](https://img.shields.io/github/downloads/atom/atom/latest/total.svg?maxAge=2592000)]()
-=======
-[![npm](https://img.shields.io/npm/v/npm.svg?maxAge=2592000)]() [![Github Releases](https://img.shields.io/github/downloads/atom/atom/latest/total.svg?maxAge=2592000)]()
->>>>>>> a5e4a0984c1efb0a3b3c4894b007b730a7894f65
 
 大房鸭前端工具，为解决开发中出现问题而诞生。