]> git.ipfire.org Git - thirdparty/pdns.git/commit
Fix merge errors 8554/head
authorOtto Moerbeek <otto.moerbeek@open-xchange.com>
Tue, 19 Nov 2019 10:49:49 +0000 (10:49 +0000)
committerOtto Moerbeek <otto.moerbeek@open-xchange.com>
Tue, 19 Nov 2019 10:49:49 +0000 (10:49 +0000)
commite8a0aa00acf1bf6f6122fbdd8c913ac5bf6c023a
treebcb5fc1b45f3a0cf954ab66ac905ec606ac951ec
parent69d3ed9c32cc0435de9a0d7dd3ced39d3b62f384
Fix merge errors
pdns/rec_channel_rec.cc
pdns/syncres.cc
pdns/syncres.hh