From d268d89c5e49f10b09211a29458f1329bb2c06fe Mon Sep 17 00:00:00 2001
From: kaiyou <pierre@jaury.eu>
Date: Fri, 23 Aug 2019 00:29:00 +0200
Subject: [PATCH] Only set the redis address once, fixes #1125

(cherry picked from commit d50504fa2b88c121de41c54d2246943b2324a95a)

# Conflicts:
#	core/admin/mailu/configuration.py
---
 core/admin/mailu/configuration.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/admin/mailu/configuration.py b/core/admin/mailu/configuration.py
index e568deb9..267f3566 100644
--- a/core/admin/mailu/configuration.py
+++ b/core/admin/mailu/configuration.py
@@ -10,6 +10,10 @@ DEFAULT_CONFIG = {
     'BABEL_DEFAULT_TIMEZONE': 'UTC',
     'BOOTSTRAP_SERVE_LOCAL': True,
     'RATELIMIT_STORAGE_URL': '',
+<<<<<<< HEAD
+=======
+    'QUOTA_STORAGE_URL': '',
+>>>>>>> d50504fa (Only set the redis address once, fixes #1125)
     'DEBUG': False,
     'DEBUG_PROFILER': False,
     'DEBUG_TB_INTERCEPT_REDIRECTS': False,