Skip to content
Browse files

modified README.md

  • Loading branch information...
1 parent 6726192 commit 90d3825ad47703de4a302b0b939ba08c61d51874 @levey levey committed Dec 5, 2011
View
BIN ...xcodeproj/project.xcworkspace/xcuserdata/Levey.xcuserdatad/UserInterfaceState.xcuserstate
Binary file not shown.
View
6 README.md
@@ -30,4 +30,8 @@ Enjoy to use it:)
Thanks for [pashields](https://github.com/pashields) providing the [youtube demo](http://www.youtube.com/watch?v=vddaYMtETjo) :)
-![screenshots](http://s2.homezz.com/201112/2509/13588_o.gif) ![screenshots](http://s3.homezz.com/201112/2509/13590_o.gif) ![screenshots](http://s0.homezz.com/201112/2509/13591_o.gif)
+<<<<<<< HEAD
+![screenshots](http://local.twitpicproxy.com/web17/img/464868884-a90cdf87da28551e02c46aab5ad0ba22.4edcc050-full.gif) ![screenshots](http://s3.homezz.com/201112/2509/13590_o.gif) ![screenshots](http://s3.homezz.com/201112/2509/13591_o.gif)
+=======
+![screenshots](http://s3.homezz.com/201112/2509/13588_o.gif) ![screenshots](http://s3.homezz.com/201112/2509/13590_o.gif) ![screenshots](http://s3.homezz.com/201112/2509/13591_o.gif)
+>>>>>>> origin/master

0 comments on commit 90d3825

Please sign in to comment.
Something went wrong with that request. Please try again.