From: Daniel Salzman <daniel.salzman@nic.cz>
Date: Sun, 15 Aug 2021 15:39:45 +0000 (+0000)
Subject: Merge branch 'cat_fix_conflict' into 'master'
X-Git-Tag: v3.3.dev~398
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d35bf403358a1046090d2a266e978bbac882bcb;p=thirdparty%2Fknot-dns.git

Merge branch 'cat_fix_conflict' into 'master'

catalog: fix conf conflict detection

Closes #761

See merge request knot/knot-dns!1345
---

8d35bf403358a1046090d2a266e978bbac882bcb