From 5174bdcfe7a934cc9b69a330f11a4b3ad68a29e8 Mon Sep 17 00:00:00 2001 From: Wlodek Wencel Date: Wed, 18 Feb 2015 20:54:29 +0100 Subject: [PATCH] [master] resolved conflict --- doc/guide/dhcp4-srv.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/doc/guide/dhcp4-srv.xml b/doc/guide/dhcp4-srv.xml index 6f415e652b..1e278a6af7 100644 --- a/doc/guide/dhcp4-srv.xml +++ b/doc/guide/dhcp4-srv.xml @@ -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. -<<<<<<< HEAD - -======= ->>>>>>> 75361d975ca689a02f6d5b759f92d07c022c86b1