Solved conflict

diff --git a/includes/dhcpd.h b/includes/dhcpd.h
index b5a254185bd327f01c9390445e84039897bfb2eb..92f77f226440e8bc4d3e7a04dd403a91afbc8450 100644 (file)
--- a/includes/dhcpd.h
+++ b/includes/dhcpd.h
@@ -807,15 +807,15 @@ struct lease_state {
 #define SV_PERSIST_EUI_64_LEASES       91
 #endif
 #if defined (FAILOVER_PROTOCOL)
-#define SV_CHECK_SECS_BYTE_ORDER       91
-#endif
-#define SV_DDNS_DUAL_STACK_MIXED_MODE  92
-#define SV_DDNS_GUARD_ID_MUST_MATCH    93
-#define SV_DDNS_OTHER_GUARD_IS_DYNAMIC 94
-#define SV_RELEASE_ON_ROAM             95
-#define SV_LOCAL_ADDRESS6              96
-#define SV_BIND_LOCAL_ADDRESS6         97
-#define SV_PING_CLTT_SECS              98
+#define SV_CHECK_SECS_BYTE_ORDER       92
+#endif
+#define SV_DDNS_DUAL_STACK_MIXED_MODE  93
+#define SV_DDNS_GUARD_ID_MUST_MATCH    94
+#define SV_DDNS_OTHER_GUARD_IS_DYNAMIC 95
+#define SV_RELEASE_ON_ROAM             96
+#define SV_LOCAL_ADDRESS6              97
+#define SV_BIND_LOCAL_ADDRESS6         98
+#define SV_PING_CLTT_SECS              99
 
 #if !defined (DEFAULT_PING_TIMEOUT)
 # define DEFAULT_PING_TIMEOUT 1