From: Yoan Le Clanche <yoanl@pilotsystems.net>
Date: Mon, 27 Jun 2022 14:14:37 +0000 (+0200)
Subject: Merge conflicted migrations
X-Git-Tag: 2.7.1~35^2~5
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=85aff509108fa524c7215545f9a3274d19248f8e;p=teleforma.git

Merge conflicted migrations
---

diff --git a/teleforma/migrations/0019_merge_20220627_1418.py b/teleforma/migrations/0019_merge_20220627_1418.py
new file mode 100644
index 00000000..84cb754d
--- /dev/null
+++ b/teleforma/migrations/0019_merge_20220627_1418.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.2.3 on 2022-06-27 14:18
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('teleforma', '0018_conference_notified'),
+        ('teleforma', '0018_notification_viewed'),
+    ]
+
+    operations = [
+    ]