From f390517fd1552e93320149032b63fbe3cff65055 Mon Sep 17 00:00:00 2001
From: Karlis Suvi <45097959+ks129@users.noreply.github.com>
Date: Tue, 25 Jan 2022 20:24:06 +0200
Subject: Try to add merge migration

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

(limited to 'pydis_site')

diff --git a/pydis_site/apps/api/migrations/0079_merge_20220125_2022.py b/pydis_site/apps/api/migrations/0079_merge_20220125_2022.py
new file mode 100644
index 00000000..9b9d9326
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0079_merge_20220125_2022.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.1.14 on 2022-01-25 20:22
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0078_merge_20211213_0552'),
+        ('api', '0074_voice_mute'),
+    ]
+
+    operations = [
+    ]
-- 
cgit v1.2.3