From 9aca77b6853cd106d265404f017d4697d04d1b25 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sat, 3 Oct 2020 10:31:04 +0300
Subject: Logs Cleanup: Fix migrations conflicts with merge migration

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

diff --git a/pydis_site/apps/api/migrations/0066_merge_20201003_0730.py b/pydis_site/apps/api/migrations/0066_merge_20201003_0730.py
new file mode 100644
index 00000000..298416db
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0066_merge_20201003_0730.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.0.9 on 2020-10-03 07:30
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0064_delete_logentry'),
+        ('api', '0065_auto_20200919_2033'),
+    ]
+
+    operations = [
+    ]
-- 
cgit v1.2.3