Commit 479b9293 authored by Francis Dupont's avatar Francis Dupont

Solved conflict

parent a5b21e16
...@@ -807,15 +807,15 @@ struct lease_state { ...@@ -807,15 +807,15 @@ struct lease_state {
#define SV_PERSIST_EUI_64_LEASES 91 #define SV_PERSIST_EUI_64_LEASES 91
#endif #endif
#if defined (FAILOVER_PROTOCOL) #if defined (FAILOVER_PROTOCOL)
#define SV_CHECK_SECS_BYTE_ORDER 91 #define SV_CHECK_SECS_BYTE_ORDER 92
#endif #endif
#define SV_DDNS_DUAL_STACK_MIXED_MODE 92 #define SV_DDNS_DUAL_STACK_MIXED_MODE 93
#define SV_DDNS_GUARD_ID_MUST_MATCH 93 #define SV_DDNS_GUARD_ID_MUST_MATCH 94
#define SV_DDNS_OTHER_GUARD_IS_DYNAMIC 94 #define SV_DDNS_OTHER_GUARD_IS_DYNAMIC 95
#define SV_RELEASE_ON_ROAM 95 #define SV_RELEASE_ON_ROAM 96
#define SV_LOCAL_ADDRESS6 96 #define SV_LOCAL_ADDRESS6 97
#define SV_BIND_LOCAL_ADDRESS6 97 #define SV_BIND_LOCAL_ADDRESS6 98
#define SV_PING_CLTT_SECS 98 #define SV_PING_CLTT_SECS 99
#if !defined (DEFAULT_PING_TIMEOUT) #if !defined (DEFAULT_PING_TIMEOUT)
# define DEFAULT_PING_TIMEOUT 1 # define DEFAULT_PING_TIMEOUT 1
......
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