Reorder conflicting leaf migrations

[laas.git] / src / api / migrations / 0022_merge_20211102_2136.py

diff --git a/src/api/migrations/0022_merge_20211102_2136.py b/src/api/migrations/0022_merge_20211102_2136.py
new file mode 100644 (file)
index 0000000..bb27ae4
--- /dev/null
+++ b/src/api/migrations/0022_merge_20211102_2136.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2 on 2021-11-02 21:36
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0019_auto_20210907_1448'),
+        ('api', '0021_auto_20210405_1943'),
+    ]
+
+    operations = [
+    ]