Fix merge conflicts
authorAndrew Bays <andrew.bays@gmail.com>
Wed, 4 Sep 2019 17:12:23 +0000 (13:12 -0400)
committerAndrew Bays <andrew.bays@gmail.com>
Wed, 4 Sep 2019 17:12:23 +0000 (13:12 -0400)
commiteb6f39121fa48db23021d0089bbbdd4616a8cccc
tree1e5258b20c9a8be9901365de5c29522ed83a8e7c
parent66cef1318ab9f8666810ac763172f8a9bccfe776
parentdefa8029f92f86dff65c18f127c80472f5833362
Fix merge conflicts
AUTHORS
configure.ac