From 2a9125ffaaad0dc5ae48856426f8011d3b35a9ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20P=C3=A9pin?= <martin.pepin@ens.fr>
Date: Thu, 24 May 2018 21:23:46 +0200
Subject: [PATCH] resolve migration conflict

---
 bda/migrations/0013_merge_20180524_2123.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 bda/migrations/0013_merge_20180524_2123.py

diff --git a/bda/migrations/0013_merge_20180524_2123.py b/bda/migrations/0013_merge_20180524_2123.py
new file mode 100644
index 00000000..ae8b0630
--- /dev/null
+++ b/bda/migrations/0013_merge_20180524_2123.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.13 on 2018-05-24 19:23
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bda', '0012_notif_time'),
+        ('bda', '0012_swap_double_choice'),
+    ]
+
+    operations = [
+    ]