Conflicts:
	Knot.files
	src/dnslib/debug.c
	src/dnslib/debug.h
	src/dnslib/dname-table.c
	src/dnslib/dname-table.h
	src/dnslib/hash/cuckoo-hash-table.c
	src/dnslib/hash/cuckoo-hash-table.h
	src/dnslib/node.c
	src/dnslib/node.h
	src/dnslib/tests/dnslib/zone_tests.c
	src/dnslib/zone-dump.c
	src/dnslib/zone-load.c
	src/dnslib/zone-tree.c
	src/dnslib/zone-tree.h
	src/dnslib/zone.c
	src/dnslib/zone.h
	src/knot/conf/cf-parse.y
	src/knot/server/journal.c
	src/knot/server/name-server.c
	src/knot/server/xfr-handler.c
	src/knot/server/xfr-handler.h
	src/knot/server/xfr-in.c
	src/knot/server/zones.c
	src/knot/server/zones.h