a conflict that should be auto fixable
authorGary Macbook <gsteele13@gmail.com>
Wed, 18 Nov 2015 23:11:55 +0000 (00:11 +0100)
committerGary Macbook <gsteele13@gmail.com>
Wed, 18 Nov 2015 23:11:55 +0000 (00:11 +0100)
commit3cc8700add50729a2033b85f4c380b2d85787684
tree41c250896922cee7a24b0dfb01fa1fae1fb67793
parent8f23beb31ecb927bba579d052dfac92bf7bbe0ae
a conflict that should be auto fixable
test1.txt