From 5b28887b3ada6056f760505e908ef9ff641655e5 Mon Sep 17 00:00:00 2001
From: chirac <chirac@raspberrypi>
Date: Mon, 23 Jul 2018 12:17:10 +0000
Subject: [PATCH] Merge les migrations

---
 .../migrations/0046_merge_20180723_1413.py       | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 preferences/migrations/0046_merge_20180723_1413.py

diff --git a/preferences/migrations/0046_merge_20180723_1413.py b/preferences/migrations/0046_merge_20180723_1413.py
new file mode 100644
index 00000000..b3dfaca6
--- /dev/null
+++ b/preferences/migrations/0046_merge_20180723_1413.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-07-23 12:13
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('preferences', '0037_optionaluser_max_mail_alias'),
+        ('preferences', '0045_remove_unused_payment_fields'),
+    ]
+
+    operations = [
+    ]