]> git.ipfire.org Git - thirdparty/pdns.git/commit
Fix merge botch
authorOtto Moerbeek <otto.moerbeek@open-xchange.com>
Tue, 4 Feb 2020 09:31:00 +0000 (10:31 +0100)
committerOtto Moerbeek <otto.moerbeek@open-xchange.com>
Wed, 4 Mar 2020 09:27:20 +0000 (10:27 +0100)
commita264db6bd2fbf06596a7c182ac9670b0b4490960
tree15924a605e895e1eac03e0161d153a8822e5313b
parentf16cb4ded4ce315bac063002c28548aafec5e2d6
Fix merge botch
pdns/syncres.cc