From 1c8415ac20c13881ba97d2354d6d1f38d3b78b2d Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Mon, 19 Mar 2018 01:56:18 +0100
Subject: [PATCH] Merge migrations

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

diff --git a/preferences/migrations/0030_merge_20180319_0149.py b/preferences/migrations/0030_merge_20180319_0149.py
new file mode 100644
index 00000000..7330e73a
--- /dev/null
+++ b/preferences/migrations/0030_merge_20180319_0149.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-03-19 00:49
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('preferences', '0029_auto_20180318_1005'),
+        ('preferences', '0029_auto_20180318_0213'),
+    ]
+
+    operations = [
+    ]