-
Daniel Salzman authored
Conflicts: src/contrib/macros.h src/knot/nameserver/update.c src/knot/zone/events/handlers.c src/knot/zone/timers.c src/knot/zone/timers.h src/libknot/dname.h src/libknot/packet/wire.h
824ce5e8
Conflicts: src/contrib/macros.h src/knot/nameserver/update.c src/knot/zone/events/handlers.c src/knot/zone/timers.c src/knot/zone/timers.h src/libknot/dname.h src/libknot/packet/wire.h