Conflicts:
	Knot.files
	src/Makefile.am
	src/common/latency.h
	src/common/slab/slab.c
	src/dnslib/dname.c
	src/dnslib/edns.c
	src/dnslib/node.c
	src/dnslib/nsec3.c
	src/dnslib/response.c
	src/dnslib/utils.h
	src/dnslib/zone.c
	src/dnslib/zone.h
	src/dnslib/zonedb.c
	src/knot/server/dthreads.c

Note: moved other/error.h/.c to knot/other/