add merged migration

diff --git a/teleforma/migrations/0029_merge_0028_auto_20240318_1139_0028_auto_20240415_0414.py b/teleforma/migrations/0029_merge_0028_auto_20240318_1139_0028_auto_20240415_0414.py
new file mode 100644 (file)
index 0000000..ec4f6e7
--- /dev/null
+++ b/teleforma/migrations/0029_merge_0028_auto_20240318_1139_0028_auto_20240415_0414.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.2.23 on 2024-04-17 10:29
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('teleforma', '0028_auto_20240318_1139'),
+        ('teleforma', '0028_auto_20240415_0414'),
+    ]
+
+    operations = [
+    ]