[#3448] Fixed rebase

diff --git a/src/bin/keactrl/tests/keactrl_tests.sh.in b/src/bin/keactrl/tests/keactrl_tests.sh.in
index 8b37f9f52aadfa87f0c09ad0095f5842379c58b8..6b529fda7733145a17462c13b29ca0c30783ab70 100755 (executable)
--- a/src/bin/keactrl/tests/keactrl_tests.sh.in
+++ b/src/bin/keactrl/tests/keactrl_tests.sh.in
@@ -1376,11 +1376,7 @@ 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