Fix migration conflicts.

1 files changed, 20 insertions, 0 deletions

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-]+$')])),
+            ],
+        ),
+    ]