From 0de744fa0d50f924a78211f990ceb1d43de85104 Mon Sep 17 00:00:00 2001
From: Dustin Sampson <dustin@sparkgeo.com>
Date: Mon, 27 Mar 2023 05:12:27 -0700
Subject: [PATCH] Add migration merge b/c of confllict

---
 ...3_auto_20230316_1608_0014_auto_20230322_2311.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 src/api/migrations/0015_merge_0013_auto_20230316_1608_0014_auto_20230322_2311.py

diff --git a/src/api/migrations/0015_merge_0013_auto_20230316_1608_0014_auto_20230322_2311.py b/src/api/migrations/0015_merge_0013_auto_20230316_1608_0014_auto_20230322_2311.py
new file mode 100644
index 00000000..87e7d45c
--- /dev/null
+++ b/src/api/migrations/0015_merge_0013_auto_20230316_1608_0014_auto_20230322_2311.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.2.18 on 2023-03-27 12:11
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0013_auto_20230316_1608'),
+        ('api', '0014_auto_20230322_2311'),
+    ]
+
+    operations = [
+    ]