From 1e3501b2f27d7e09a873dc3348d196ac2edda68b Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Thu, 28 May 2020 08:49:49 +0300
Subject: OT: Fix migrations nr conflict

---
 .../api/migrations/0051_offtopicchannelname_used.py    | 18 ------------------
 .../api/migrations/0052_offtopicchannelname_used.py    | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 18 deletions(-)
 delete mode 100644 pydis_site/apps/api/migrations/0051_offtopicchannelname_used.py
 create mode 100644 pydis_site/apps/api/migrations/0052_offtopicchannelname_used.py

(limited to 'pydis_site')

diff --git a/pydis_site/apps/api/migrations/0051_offtopicchannelname_used.py b/pydis_site/apps/api/migrations/0051_offtopicchannelname_used.py
deleted file mode 100644
index 1b838aec..00000000
--- a/pydis_site/apps/api/migrations/0051_offtopicchannelname_used.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2.11 on 2020-03-30 10:24
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('api', '0050_remove_infractions_active_default_value'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='offtopicchannelname',
-            name='used',
-            field=models.BooleanField(default=False, help_text='Whether or not this name has already been used during this rotation'),
-        ),
-    ]
diff --git a/pydis_site/apps/api/migrations/0052_offtopicchannelname_used.py b/pydis_site/apps/api/migrations/0052_offtopicchannelname_used.py
new file mode 100644
index 00000000..dfdf3835
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0052_offtopicchannelname_used.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.11 on 2020-03-30 10:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0051_create_news_setting'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='offtopicchannelname',
+            name='used',
+            field=models.BooleanField(default=False, help_text='Whether or not this name has already been used during this rotation'),
+        ),
+    ]
-- 
cgit v1.2.3