From: Wlodek Wencel <wlodek@isc.org>
Date: Wed, 18 Feb 2015 19:51:16 +0000 (+0100)
Subject: [master] minor changes in kea-guide
X-Git-Tag: trac3723_base~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d0b7d60b3600b4970095ee256a6db4254c12fa1a;p=thirdparty%2Fkea.git

[master] minor changes in kea-guide
---

d0b7d60b3600b4970095ee256a6db4254c12fa1a
diff --cc doc/guide/dhcp4-srv.xml
index 3f64f93d9c,1e278a6af7..6f415e652b
--- a/doc/guide/dhcp4-srv.xml
+++ b/doc/guide/dhcp4-srv.xml
@@@ -237,7 -237,6 +237,10 @@@ global and Dhcp4, hence we need two clo
  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>