pdxcat/nixmentors — pull request #24 by mongolsamurai (2014-04-17 03:39:04+00:00)
Title: fixed a typo in the merge conflicts code block

changed "git merge derp" to "git merge newbranch"