From 09b461cecabea452483ae3e9e9ed28f43594ec26 Mon Sep 17 00:00:00 2001
From: =?utf8?q?St=C3=A9phane=20Jacob?= <sj@m4x.org>
Date: Fri, 15 Oct 2010 16:36:42 +0200
Subject: [PATCH] Adds merge parameters in configuration files.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---
 configs/platal.ini | 7 +++++++
 1 file changed, 7 insertions(+)

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