Permalink
Browse files

resolved merge conflict

  • Loading branch information...
2 parents 5f96f49 + 0d60168 commit 4d29ab9bfe1deeb53f7e359cdf3b5de686507de5 @jamilbk committed May 18, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 README
View
2 README
@@ -1,2 +1,2 @@
-Hello there.
+Hi there.
Well hello back!

0 comments on commit 4d29ab9

Please sign in to comment.