Fixed merge conflicts

1 files changed, 18 insertions, 0 deletions

diff --git a/api/migrations/0021_infraction_reason_null.py b/api/migrations/0021_infraction_reason_null.py
new file mode 100644
index 00000000..6600f230
--- /dev/null
+++ b/api/migrations/0021_infraction_reason_null.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.1.3 on 2018-11-21 00:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0020_infraction'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='infraction',
+            name='reason',
+            field=models.TextField(help_text='The reason for the infraction.', null=True),
+        ),
+    ]