From d39b4ae8cb89c4b07f0e101c7faaeee9806238f8 Mon Sep 17 00:00:00 2001
From: Trenton Holmes <holmes.trenton@gmail.com>
Date: Wed, 24 Aug 2022 06:43:52 -0700
Subject: [PATCH] Merges the migration branches

---
 .../migrations/1024_merge_20220824_1341.py          | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 src/documents/migrations/1024_merge_20220824_1341.py

diff --git a/src/documents/migrations/1024_merge_20220824_1341.py b/src/documents/migrations/1024_merge_20220824_1341.py
new file mode 100644
index 000000000..4a2b9706a
--- /dev/null
+++ b/src/documents/migrations/1024_merge_20220824_1341.py
@@ -0,0 +1,13 @@
+# Generated by Django 4.0.6 on 2022-08-24 13:41
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("documents", "1023_add_comments"),
+        ("documents", "1023_document_original_filename"),
+    ]
+
+    operations = []