Commit 5174bdcf authored by Wlodzimierz Wencel's avatar Wlodzimierz Wencel
Browse files

[master] resolved conflict

parent d0b7d60b
......@@ -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>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment