Permalink
Browse files

merge

  • Loading branch information...
2 parents f4c8ae7 + 9166fd2 commit 79b5b5728d83427228bc7a6423e8eb9e967db9ff @marscn marscn committed Aug 9, 2012
Showing with 2 additions and 0 deletions.
  1. +2 −0 README.mkd
View
@@ -76,3 +76,5 @@ Write something, please.
+ exercise4,masai
+ exercise6 masai11
+ conflicts??masai
++ masai branch merge
+

0 comments on commit 79b5b57

Please sign in to comment.