From 6c64d3483d96d635eb0c23002a97a54b502b000b Mon Sep 17 00:00:00 2001
From: Yoan Le Clanche <yoanl@pilotsystems.net>
Date: Thu, 10 Oct 2024 10:10:51 +0200
Subject: [PATCH] Merge migrations

---
 teleforma/migrations/0021_course_quiz.py      | 19 -------------------
 .../migrations/0030_merge_20241010_0926.py    | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 19 deletions(-)
 delete mode 100644 teleforma/migrations/0021_course_quiz.py
 create mode 100644 teleforma/migrations/0030_merge_20241010_0926.py

diff --git a/teleforma/migrations/0021_course_quiz.py b/teleforma/migrations/0021_course_quiz.py
deleted file mode 100644
index 1c670d29..00000000
--- 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
index 00000000..086c3974
--- /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 = [
+    ]
-- 
2.39.5