-
Marek Vavruša authored
Conflicts: Knot.files src/Makefile.am src/knot/conf/conf.h src/knot/nameserver/process_answer.c src/knot/zone/events/handlers.c
1a848d22
Conflicts: Knot.files src/Makefile.am src/knot/conf/conf.h src/knot/nameserver/process_answer.c src/knot/zone/events/handlers.c