Conflicts:
	.gitignore
	Doxy.page.h
	Doxyfile
	Knot.files
	src/Makefile.am
	src/common/descriptor_new.c
	src/common/descriptor_new.h
	src/common/errcode.c
	src/common/errcode.h
	src/libknot/nameserver/name-server.c
	src/libknot/rrset.c
	src/libknot/rrset.h
	src/libknot/updates/changesets.h
	src/libknot/util/descriptor.h
	src/libknot/zone/zone-contents.c
	src/tests/libknot/libknot/rrset_tests.c
	src/tests/libknot/unittests_libknot.c
	src/zscanner/NOTES
	src/zscanner/scanner.h
	src/zscanner/scanner.rl
	src/zscanner/scanner_body.rl
	src/zscanner/scanner_functions.c
	src/zscanner/test/processing.c