From 1095589ca30381c17cc8791363bb8f3ad11c43fb Mon Sep 17 00:00:00 2001
From: Sawyer Bergeron <sbergeron@iol.unh.edu>
Date: Wed, 15 Dec 2021 16:45:18 -0500
Subject: Reorder conflicting leaf migrations

Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
Change-Id: I0c06f6f6ceccc17431d319577b72dfe75bea7cff
Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
---
 src/api/migrations/0022_merge_20211102_2136.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 src/api/migrations/0022_merge_20211102_2136.py

(limited to '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
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 = [
+    ]
-- 
cgit 1.2.3-korg