]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[#3448] Checkpoint
authorFrancis Dupont <fdupont@isc.org>
Mon, 16 Mar 2026 15:33:45 +0000 (16:33 +0100)
committerRazvan Becheriu <razvan@isc.org>
Mon, 20 Apr 2026 13:51:56 +0000 (13:51 +0000)
src/bin/keactrl/tests/keactrl_tests.sh.in

index 6b529fda7733145a17462c13b29ca0c30783ab70..8b37f9f52aadfa87f0c09ad0095f5842379c58b8 100755 (executable)
@@ -1376,7 +1376,11 @@ version_command_test() {
     exp="keactrl: @PACKAGE_VERSION@\n"
     exp="${exp}kea-dhcp4: @PACKAGE_VERSION@\n"
     exp="${exp}kea-dhcp6: @PACKAGE_VERSION@\n"
+<<<<<<< HEAD
     exp="${exp}kea-dhcp-ddns: @PACKAGE_VERSION@"
+=======
+    exp="${exp}kea-dhcp-ddns: @PACKAGE_VERSION@\n"
+>>>>>>> f000bd1240 ([#3448] Checkpoint)
     if ${have_netconf}; then
         exp="${exp}\nkea-netconf: @PACKAGE_VERSION@"
     fi