Commit ab83d427 authored by Andrei Pavel's avatar Andrei Pavel

forgot a merge conflict marker

parent 11cc65e3
......@@ -471,7 +471,6 @@ be followed by a comma and another object definition.</para>
specified as well:
<screen>
"Dhcp4": { "lease-database": { <userinput>"port" : 12345</userinput>, ... }, ... }
>>>>>>> isc-master
</screen>
Should the database be located on a different system, you may need to specify a longer interval
for the connection timeout:
......
Markdown is supported
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