forgot a merge conflict marker

diff --git a/doc/guide/dhcp6-srv.xml b/doc/guide/dhcp6-srv.xml
index 532beab22decce0882054fa9e026c2dc23cb2b5d..c6bf0dc80448cf956d47470b6d12d85645f5e876 100644 (file)
--- 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: