-
Marek Vavruša authored
Conflicts: src/knot/conf/conf.c src/knot/dnssec/nsec-chain.c src/knot/dnssec/nsec-chain.h src/knot/dnssec/nsec3-chain.c src/knot/dnssec/zone-events.c src/knot/dnssec/zone-events.h src/knot/dnssec/zone-nsec.c src/knot/dnssec/zone-nsec.h src/knot/dnssec/zone-sign.c src/knot/main.c src/knot/nameserver/axfr.c src/knot/nameserver/update.c src/knot/server/xfr-handler.c src/knot/server/xfr-handler.h src/knot/server/zone-load.c src/knot/server/zones.c src/knot/server/zones.h src/knot/updates/changesets.c src/knot/updates/changesets.h src/knot/updates/ddns.c src/knot/updates/ddns.h src/knot/updates/xfr-in.c src/knot/updates/xfr-in.h src/knot/zone/contents.c src/knot/zone/contents.h src/knot/zone/semantic-check.c src/knot/zone/zone-diff.c src/knot/zone/zone.c src/knot/zone/zonefile.c src/knot/zone/zonefile.h
9203dce1