Conflicts:
	src/knot/zone/semantic-check.c
	src/libknot/dname.c
	src/libknot/dname.h
	src/libknot/dnssec/key.c
	src/libknot/rrset.c
	src/libknot/rrset.h
	src/libknot/zone/zone-contents.c
	src/tests/libknot/sign_tests.c
	src/utils/common/params.c