From 1722bbd83cf2777d8f936b274df54bdcca384ea9 Mon Sep 17 00:00:00 2001
From: Matt Frazier <maf7sm@virginia.edu>
Date: Mon, 18 Dec 2023 09:46:20 -0500
Subject: [PATCH] Add merge migration

---
 osf/migrations/0018_merge_20231218_1446.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 osf/migrations/0018_merge_20231218_1446.py

diff --git a/osf/migrations/0018_merge_20231218_1446.py b/osf/migrations/0018_merge_20231218_1446.py
new file mode 100644
index 00000000000..f76317978f7
--- /dev/null
+++ b/osf/migrations/0018_merge_20231218_1446.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.2.17 on 2023-12-18 14:46
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('osf', '0017_alter_notabledomain_note'),
+        ('osf', '0017_auto_20231212_1843'),
+    ]
+
+    operations = [
+    ]