From 55d9288f11e2981eb9251f92164a597869c07cf9 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Fri, 29 Oct 2021 20:11:38 +0300
Subject: Add merge migration

---
 pydis_site/apps/api/migrations/0074_merge_20211017_0822.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 pydis_site/apps/api/migrations/0074_merge_20211017_0822.py

(limited to 'pydis_site/apps')

diff --git a/pydis_site/apps/api/migrations/0074_merge_20211017_0822.py b/pydis_site/apps/api/migrations/0074_merge_20211017_0822.py
new file mode 100644
index 00000000..ae41ac71
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0074_merge_20211017_0822.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.0.14 on 2021-10-17 08:22
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0073_otn_allow_GT_and_LT'),
+        ('api', '0070_new_filter_schema'),
+    ]
+
+    operations = [
+    ]
-- 
cgit v1.2.3