Update README.md

D-W- · Mar 4, 2015 · d652153 · d652153
1 parent 4135511
commit d652153
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
-<<<<<<< HEAD
-#haha is a little sweet dog.
+
+#模仿《抓住神经猫》写的cocos2d-x版本小游戏CatchDrop
 =======
 本产品由老范和鸡蛋共同出品。
 >>>>>>> 327fa059e30deb077f954aaac5534bfcbca022ba