Fix git merge hiccup
authorBruno Perel <bperel@users.noreply.github.com>
Sat, 29 Feb 2020 10:11:30 +0000 (11:11 +0100)
committerRoeland Jago Douma <rullzer@users.noreply.github.com>
Mon, 2 Mar 2020 07:05:37 +0000 (08:05 +0100)
commit7378ae6a7ff4d8e53aa7fc1030e3b4e34b680e67
treef78841483fc3e09bf9d561290af28f40e3b57323
parent68ee513bd096b52b1b0b9b31dbe7971e06898512
Fix git merge hiccup
doc/installing.rst