skaplanhex/testrepo — pull request #2 by skaplanhex (2014-04-01 01:35:04+00:00)
Title: Merge greatfile.txt

There is a merge conflict, how can it be resolved?