Add merge migration file

1 files changed, 14 insertions, 0 deletions

diff --git a/pydis_site/apps/api/migrations/0047_merge_20191025_1920.py b/pydis_site/apps/api/migrations/0047_merge_20191025_1920.py
new file mode 100644
index 00000000..f70fe24f
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0047_merge_20191025_1920.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2.6 on 2019-10-25 17:20
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0046_reminder_jump_url'),
+        ('api', '0046_offensivemessage'),
+    ]
+
+    operations = [
+    ]