merge migration

diff --git a/teleforma/migrations/0042_merge_20260924_1745.py b/teleforma/migrations/0042_merge_20260924_1745.py
new file mode 100644 (file)
index 0000000..a23bcdb
--- /dev/null
+++ b/teleforma/migrations/0042_merge_20260924_1745.py
@@ -0,0 +1,14 @@
+# Generated by Django 5.2.13 on 2026-09-24 17:45
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('teleforma', '0041_conference_s3_exported_media_poster_file_s3'),
+        ('teleforma', '0041_student_training_adaptability_disability'),
+    ]
+
+    operations = [
+    ]