Resolve completely trivial alleged conflict that git should have been able to handle...
authorMike Taylor <mike@indexdata.com>
Thu, 28 Apr 2016 13:59:35 +0000 (14:59 +0100)
committerMike Taylor <mike@indexdata.com>
Thu, 28 Apr 2016 13:59:35 +0000 (14:59 +0100)
commit434d9eece338a156239bc975ff0d983fbb8aa9b4
tree7637cc520332bc3555812dd79ea522cb99f30af6
parent7bc76f399a89654ee107a9dfe0b60770c4dfd264
parent954dffaba7a6e5cbea557e6ba19a5bab90440200
Resolve completely trivial alleged conflict that git should have been able to handle standing on its head