aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar ks129 <[email protected]>2020-10-03 10:31:04 +0300
committerGravatar ks129 <[email protected]>2020-10-03 10:31:04 +0300
commit9aca77b6853cd106d265404f017d4697d04d1b25 (patch)
tree2bf63bf4f1f4ceeffc6a1c8fa76a8a040fb6c432
parentLogs Cleanup: Remove removed LogEntry model import (diff)
Logs Cleanup: Fix migrations conflicts with merge migration
-rw-r--r--pydis_site/apps/api/migrations/0066_merge_20201003_0730.py14
1 files changed, 14 insertions, 0 deletions
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 = [
+ ]