master:修改readme

RainesGit · Nov 23, 2015 · 69dde54 · 69dde54
1 parent 84de39e
commit 69dde54
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -67,4 +67,3 @@ createdAt:Date
 ![Alt text](https://github.com/chenyufeng1991/iOS-Oncenote/raw/master/Screenshots/12.png)
 ##5.技术博客
 我的个人技术博客：[http://blog.csdn.net/chenyufeng1991](http://blog.csdn.net/chenyufeng1991) 。欢迎大家访问！
->>>>>>> dev