daviskoh/concepts_practice — pull request #3 by daviskoh (2014-03-30 20:10:31+00:00)
Title: add merging md file

-simple commands
-reading merge conflict git annotations