From: Yoan Le Clanche <yoanl@pilotsystems.net>
Date: Wed, 29 Sep 2021 15:19:16 +0000 (+0200)
Subject: Merge migration
X-Git-Tag: 2.5.0~55
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2d580e87e638d99681efcaaa9de7076198a875fd;p=teleforma.git

Merge migration
---

diff --git a/teleforma/migrations/0012_merge_0011_coursetype_order_0011_merge_20210929_1024.py b/teleforma/migrations/0012_merge_0011_coursetype_order_0011_merge_20210929_1024.py
new file mode 100644
index 00000000..a05c5836
--- /dev/null
+++ b/teleforma/migrations/0012_merge_0011_coursetype_order_0011_merge_20210929_1024.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.2.3 on 2021-09-29 17:19
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('teleforma', '0011_coursetype_order'),
+        ('teleforma', '0011_merge_20210929_1024'),
+    ]
+
+    operations = [
+    ]