mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-31 22:15:23 +00:00
Code Issues Releases Wiki Activity

[master] resolved conflict

Browse Source
This commit is contained in:
Wlodek Wencel
2015-02-18 20:54:29 +01:00
parent d0b7d60b36
commit 5174bdcfe7
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/guide/dhcp4-srv.xml
View File

@@ -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>