summaryrefslogtreecommitdiff
path: root/server/confpars.c
diff options
context:
space:
mode:
Diffstat (limited to 'server/confpars.c')
-rw-r--r--server/confpars.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/server/confpars.c b/server/confpars.c
index a1c4bf0f..583a4c28 100644
--- a/server/confpars.c
+++ b/server/confpars.c
@@ -1276,6 +1276,10 @@ void parse_failover_state (cfile, state, stos)
state_in = communications_interrupted;
break;
+ case CONFLICT_DONE:
+ state_in = conflict_done;
+ break;
+
case RESOLUTION_INTERRUPTED:
state_in = resolution_interrupted;
break;