From: Guillaume Pellerin <guillaume.pellerin@parisson.com>
Date: Wed, 17 Apr 2024 08:36:39 +0000 (+0200)
Subject: add merged migration
X-Git-Tag: 2.9.0~20^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d77d124163fe518e54cdd1e620e55afebec8ff4c;p=teleforma.git

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
index 00000000..ec4f6e79
--- /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 = [
+    ]