From: Andrei Pavel <andrei.pavel@qualitance.com>
Date: Fri, 18 Aug 2017 13:53:39 +0000 (+0300)
Subject: forgot a merge conflict marker
X-Git-Tag: trac5494_base~11^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab83d427310d11373099356322de1b76a543ab8f;p=thirdparty%2Fkea.git

forgot a merge conflict marker
---

diff --git a/doc/guide/dhcp6-srv.xml b/doc/guide/dhcp6-srv.xml
index 532beab22d..c6bf0dc804 100644
--- a/doc/guide/dhcp6-srv.xml
+++ b/doc/guide/dhcp6-srv.xml
@@ -471,7 +471,6 @@ be followed by a comma and another object definition.</para>
   specified as well:
 <screen>
 "Dhcp4": { "lease-database": { <userinput>"port" : 12345</userinput>, ... }, ... }
->>>>>>> isc-master
 </screen>
   Should the database be located on a different system, you may need to specify a longer interval
   for the connection timeout: