-
Lubos Slovak authored
Conflicts: src/Makefile.am src/knot/conf/logconf.c src/utils/common/exec.c src/utils/dig/dig_params.c tests/edns.c
0448ac6c
Conflicts: src/Makefile.am src/knot/conf/logconf.c src/utils/common/exec.c src/utils/dig/dig_params.c tests/edns.c