[master] resolved conflict

diff --git a/doc/guide/dhcp4-srv.xml b/doc/guide/dhcp4-srv.xml
index 6f415e652bb50b5b026661c8218e69bd6c84b769..1e278a6af77fa26ef1a5f98e296c5a4f3f155a4d 100644 (file)
--- a/doc/guide/dhcp4-srv.xml
+++ b/doc/guide/dhcp4-srv.xml
@@ -237,10 +237,6 @@ global and Dhcp4, hence we need two closing curly brackets to close them.
 In a real life configuration file there most likely would be additional
 components defined such as Logging or DhcpDdns, so the closing brace would
 be followed by a comma and another object definition.</para>
-<<<<<<< HEAD
-
-=======
->>>>>>> 75361d975ca689a02f6d5b759f92d07c022c86b1
 </section>
 
 <section>