Browse Source

[master] resolved conflict

Wlodek Wencel 10 years ago
parent
commit
5174bdcfe7
1 changed files with 0 additions and 4 deletions
  1. 0 4
      doc/guide/dhcp4-srv.xml

+ 0 - 4
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
 In a real life configuration file there most likely would be additional
 components defined such as Logging or DhcpDdns, so the closing brace would
 components defined such as Logging or DhcpDdns, so the closing brace would
 be followed by a comma and another object definition.</para>
 be followed by a comma and another object definition.</para>
-<<<<<<< HEAD
-
-=======
->>>>>>> 75361d975ca689a02f6d5b759f92d07c022c86b1
 </section>
 </section>
 
 
 <section>
 <section>