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 (file)
index 0000000..84cb754
--- /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 = [
+    ]