]> git.ipfire.org Git - thirdparty/pdns.git/commit
Resolve merge errors.
authorOtto Moerbeek <otto.moerbeek@open-xchange.com>
Tue, 18 Jun 2019 08:30:12 +0000 (10:30 +0200)
committerOtto Moerbeek <otto.moerbeek@open-xchange.com>
Tue, 18 Jun 2019 08:30:12 +0000 (10:30 +0200)
commit5c4ff38c2366ec0f166264ac747b792cbefb53eb
treefae26d1aaf7e08a6d62a6fde030ff9d549986008
parent3fcf2c9eb8d4c84775c2bf7d1b978bcc5e1b2ac2
Resolve merge errors.
pdns/recursordist/test-syncres_cc1.cc
pdns/syncres.cc