From 717f3804d2998618b3c345bd9cbb4b42703858c9 Mon Sep 17 00:00:00 2001
From: Johannes Christ <jc@jchri.st>
Date: Sat, 1 Sep 2018 17:54:38 +0200
Subject: Fix migration conflicts.

---
 api/migrations/0002_offtopicchannelname.py | 20 --------------------
 api/migrations/0003_offtopicchannelname.py | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 20 deletions(-)
 delete mode 100644 api/migrations/0002_offtopicchannelname.py
 create mode 100644 api/migrations/0003_offtopicchannelname.py

(limited to 'api')

diff --git a/api/migrations/0002_offtopicchannelname.py b/api/migrations/0002_offtopicchannelname.py
deleted file mode 100644
index 890cd81f..00000000
--- a/api/migrations/0002_offtopicchannelname.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Generated by Django 2.1 on 2018-08-31 22:21
-
-import django.core.validators
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('api', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='OffTopicChannelName',
-            fields=[
-                ('name', models.CharField(max_length=96, primary_key=True, serialize=False, validators=[django.core.validators.RegexValidator(regex='^[a-z0-9-]+$')])),
-            ],
-        ),
-    ]
diff --git a/api/migrations/0003_offtopicchannelname.py b/api/migrations/0003_offtopicchannelname.py
new file mode 100644
index 00000000..2f19bfd8
--- /dev/null
+++ b/api/migrations/0003_offtopicchannelname.py
@@ -0,0 +1,20 @@
+# Generated by Django 2.1 on 2018-08-31 22:21
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0002_documentationlink'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='OffTopicChannelName',
+            fields=[
+                ('name', models.CharField(max_length=96, primary_key=True, serialize=False, validators=[django.core.validators.RegexValidator(regex='^[a-z0-9-]+$')])),
+            ],
+        ),
+    ]
-- 
cgit v1.2.3