-
JINMEI Tatuya authored
fixed Conflicts: src/bin/ddns/tests/ddns_test.py src/bin/xfrin/tests/xfrin_test.py src/lib/dns/python/tests/zone_checker_python_test.py src/lib/python/isc/ddns/tests/session_tests.py
e5005185
fixed Conflicts: src/bin/ddns/tests/ddns_test.py src/bin/xfrin/tests/xfrin_test.py src/lib/dns/python/tests/zone_checker_python_test.py src/lib/python/isc/ddns/tests/session_tests.py