philiprhoades/t1 — pull request #3 by philiprhoades (2013-12-05 07:03:58+00:00)
Title: modified only one of the text files in local repo of tbranch to conflict...

... with the GitHub edit