Adds merge parameters in configuration files.

Signed-off-by: Stéphane Jacob <sj@m4x.org>

diff --git a/configs/platal.ini b/configs/platal.ini
index a0cfbd1..a8cb4c2 100644 (file)
--- a/configs/platal.ini
+++ b/configs/platal.ini
@@ -381,3 +381,10 @@ auth_baseurl = ""
 ; Domain address where the aliases containing the list of (non-)subscribers
 ; of an event are created.
 evts_domain  = ""
+
+; The merge section contains parameters about the merge's state.
+[Merge]
+
+; $globals->merge->state
+; Pending before the merge, done afterwards.
+state = "pending"