From: Francis Dupont <fdupont@isc.org>
Date: Thu, 26 Mar 2026 09:41:02 +0000 (+0100)
Subject: [#3448] Fixed rebase
X-Git-Tag: Kea-3.1.8~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f41df24da7b585ac762fe89c08645161ca9ffd3;p=thirdparty%2Fkea.git

[#3448] Fixed rebase
---

diff --git a/src/bin/keactrl/tests/keactrl_tests.sh.in b/src/bin/keactrl/tests/keactrl_tests.sh.in
index 8b37f9f52a..6b529fda77 100755
--- 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