From b76ecca432a51885407e434df6916d71ae06aad6 Mon Sep 17 00:00:00 2001
From: ethanandrews <eandrews@whoi.edu>
Date: Thu, 10 Jun 2021 13:32:08 -0400
Subject: [PATCH] merge conflicting migrations

---
 .../migrations/0033_merge_20210610_1729.py         | 14 ++++++++++++++
 .../migrations/0028_merge_20210610_1729.py         | 14 ++++++++++++++
 .../migrations/0069_merge_20210610_1728.py         | 14 ++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 100644 roundabout/calibrations/migrations/0033_merge_20210610_1729.py
 create mode 100644 roundabout/configs_constants/migrations/0028_merge_20210610_1729.py
 create mode 100644 roundabout/inventory/migrations/0069_merge_20210610_1728.py

diff --git a/roundabout/calibrations/migrations/0033_merge_20210610_1729.py b/roundabout/calibrations/migrations/0033_merge_20210610_1729.py
new file mode 100644
index 00000000..936051a0
--- /dev/null
+++ b/roundabout/calibrations/migrations/0033_merge_20210610_1729.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.1.3 on 2021-06-10 17:29
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('calibrations', '0030_auto_20210609_0619'),
+        ('calibrations', '0032_auto_20210512_1452'),
+    ]
+
+    operations = [
+    ]
diff --git a/roundabout/configs_constants/migrations/0028_merge_20210610_1729.py b/roundabout/configs_constants/migrations/0028_merge_20210610_1729.py
new file mode 100644
index 00000000..34d38480
--- /dev/null
+++ b/roundabout/configs_constants/migrations/0028_merge_20210610_1729.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.1.3 on 2021-06-10 17:29
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('configs_constants', '0027_auto_20210514_1635'),
+        ('configs_constants', '0024_auto_20210609_0619'),
+    ]
+
+    operations = [
+    ]
diff --git a/roundabout/inventory/migrations/0069_merge_20210610_1728.py b/roundabout/inventory/migrations/0069_merge_20210610_1728.py
new file mode 100644
index 00000000..51785923
--- /dev/null
+++ b/roundabout/inventory/migrations/0069_merge_20210610_1728.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.1.3 on 2021-06-10 17:28
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('inventory', '0068_auto_20210609_0619'),
+        ('inventory', '0068_auto_20210512_1446'),
+    ]
+
+    operations = [
+    ]