]> git.ipfire.org Git - thirdparty/knot-dns.git/commitdiff
projects / thirdparty / knot-dns.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 99a46fb 293ad73)
Merge branch 'cat_fix_conflict' into 'master'
authorDaniel Salzman <daniel.salzman@nic.cz>
Sun, 15 Aug 2021 15:39:45 +0000 (15:39 +0000)
committerDaniel Salzman <daniel.salzman@nic.cz>
Sun, 15 Aug 2021 15:39:45 +0000 (15:39 +0000)
catalog: fix conf conflict detection

Closes #761

See merge request knot/knot-dns!1345


Trivial merge
Mirror of https://gitlab.nic.cz/knot/knot-dns.git