From ab634c6ef1d4b7cec3b8471262eec3ec727478d8 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sun, 30 Aug 2020 08:27:07 +0300
Subject: Create merge migration to fix conflicts

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

(limited to 'pydis_site')

diff --git a/pydis_site/apps/api/migrations/0061_merge_20200830_0526.py b/pydis_site/apps/api/migrations/0061_merge_20200830_0526.py
new file mode 100644
index 00000000..f0668696
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0061_merge_20200830_0526.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.0.8 on 2020-08-30 05:26
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0060_populate_filterlists_fix'),
+        ('api', '0052_offtopicchannelname_used'),
+    ]
+
+    operations = [
+    ]
-- 
cgit v1.2.3