From: Stéphane Jacob <sj@m4x.org>
Date: Fri, 15 Oct 2010 14:36:42 +0000 (+0200)
Subject: Adds merge parameters in configuration files.
X-Git-Tag: xorg/1.0.1~38
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=09b461cecabea452483ae3e9e9ed28f43594ec26;p=platal.git

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
--- 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"