doc/user-manual/: Fix merge.
authorMatt Birkholz <matt@birchwood-abbey.net>
Sun, 25 Nov 2018 00:21:28 +0000 (17:21 -0700)
committerMatt Birkholz <matt@birchwood-abbey.net>
Sun, 25 Nov 2018 00:21:28 +0000 (17:21 -0700)
commitfcf4e9d8b72cfd64aaf72be966d91527cfb835e1
tree65598a8610bc7b74b37ddbfdb0c31220a2f7df74
parent3cfdbe75b454affa9175d72c4b8d7b24b3e2b712
doc/user-manual/: Fix merge.
doc/user-manual/user.texinfo