revert previous commit

[osqa.git] / forum_modules / exporter / settings.py

diff --git a/forum_modules/exporter/settings.py b/forum_modules/exporter/settings.py
index 232cd10693f8fffb46681fdcf2992ef0e2005092..a37cd1b84f754712b9f6730aa84b57bc0902975f 100644 (file)
--- a/forum_modules/exporter/settings.py
+++ b/forum_modules/exporter/settings.py
@@ -8,4 +8,6 @@ EXPORTER_SET = SettingSet('exporter', _('Exporter settings'), _("Data export set
 
 EXPORTER_BACKUP_STORAGE = Setting('EXPORTER_BACKUP_STORAGE', os.path.join(os.path.dirname(__file__), 'backups'), EXPORTER_SET, dict(
 label = _("Backups storage"),
-help_text = _("A folder to keep your backups organized.")))
\ No newline at end of file
+help_text = _("A folder to keep your backups organized.")))
+
+MERGE_MAPPINGS = Setting('MERGE_MAPPINGS', {})
\ No newline at end of file