Merge migrations

diff --git a/teleforma/migrations/0021_course_quiz.py b/teleforma/migrations/0021_course_quiz.py
deleted file mode 100644 (file)
index 1c670d2..0000000
--- a/teleforma/migrations/0021_course_quiz.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 3.2.13 on 2022-10-06 16:30
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('quiz', '__first__'),
-        ('teleforma', '0020_chatmessage_reply_to'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='course',
-            name='quiz',
-            field=models.ManyToManyField(blank=True, null=True, to='quiz.Quiz', verbose_name='quiz'),
-        ),
-    ]

diff --git a/teleforma/migrations/0030_merge_20241010_0926.py b/teleforma/migrations/0030_merge_20241010_0926.py
new file mode 100644 (file)
index 0000000..086c397
--- /dev/null
+++ b/teleforma/migrations/0030_merge_20241010_0926.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.2.25 on 2024-10-10 09:26
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('teleforma', '0027_course_quiz'),
+        ('teleforma', '0029_merge_0028_auto_20240318_1139_0028_auto_20240415_0414'),
+    ]
+
+    operations = [
+    ]