a conflict that should auto-solve
authorGary Macbook <gsteele13@gmail.com>
Wed, 18 Nov 2015 23:20:06 +0000 (00:20 +0100)
committerGary Macbook <gsteele13@gmail.com>
Wed, 18 Nov 2015 23:20:06 +0000 (00:20 +0100)
commitb2117fbf1be6085c4bbefa69192849c62b3ed0e7
tree5677c79d90f446296a9b8dbad7888d444d9e2519
parent8f23beb31ecb927bba579d052dfac92bf7bbe0ae
a conflict that should auto-solve
test1.txt