diff options
| author | Andrei Pavel <andrei.pavel@qualitance.com> | 2017-08-18 15:53:39 +0200 |
|---|---|---|
| committer | Andrei Pavel <andrei.pavel@qualitance.com> | 2017-08-18 15:54:41 +0200 |
| commit | ab83d427310d11373099356322de1b76a543ab8f (patch) | |
| tree | a29f0c754da1a5eac3ec084e11b2bcd2410476bc /doc/guide/dhcp6-srv.xml | |
| parent | boost::any for cassandra and more: (diff) | |
| download | kea-ab83d427310d11373099356322de1b76a543ab8f.tar.xz kea-ab83d427310d11373099356322de1b76a543ab8f.zip | |
forgot a merge conflict marker
Diffstat (limited to 'doc/guide/dhcp6-srv.xml')
| -rw-r--r-- | doc/guide/dhcp6-srv.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/guide/dhcp6-srv.xml b/doc/guide/dhcp6-srv.xml index 532beab22d..c6bf0dc804 100644 --- a/doc/guide/dhcp6-srv.xml +++ b/doc/guide/dhcp6-srv.xml @@ -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: |