committing the changes by user 2 that make the conflict
authorGary Macbook <gsteele13@gmail.com>
Wed, 18 Nov 2015 22:56:55 +0000 (23:56 +0100)
committerGary Macbook <gsteele13@gmail.com>
Wed, 18 Nov 2015 22:56:55 +0000 (23:56 +0100)
commita77090b7ed3b53e8583dbfe4d3bb651fae365108
treee3ea2ccd6b47d24a67e343150073ff122c71c8e2
parent9e70f11aaf3a9e8db1b3e15aaed0cb13f41073dd
committing the changes by user 2 that make the conflict
test1.txt