From d6cc932e9eb4a0559eeb2f7cd8b0737cbff40d23 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Fri, 21 Jul 2017 09:35:19 +0200
Subject: [PATCH] Fix merge conflict
---
.../migrations/0048_auto_20170721_0931.py | 30 +++++++++++++++++++
.../migrations/0051_merge_20170721_0934.py | 16 ++++++++++
2 files changed, 46 insertions(+)
create mode 100644 submissions/migrations/0048_auto_20170721_0931.py
create mode 100644 submissions/migrations/0051_merge_20170721_0934.py
diff --git a/submissions/migrations/0048_auto_20170721_0931.py b/submissions/migrations/0048_auto_20170721_0931.py
new file mode 100644
index 000000000..3f0a084e2
--- /dev/null
+++ b/submissions/migrations/0048_auto_20170721_0931.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-07-21 07:31
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('submissions', '0047_submission_acceptance_date'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='report',
+ name='requested_changes',
+ field=models.TextField(blank=True, verbose_name='requested changes'),
+ ),
+ migrations.AlterField(
+ model_name='report',
+ name='strengths',
+ field=models.TextField(blank=True),
+ ),
+ migrations.AlterField(
+ model_name='report',
+ name='weaknesses',
+ field=models.TextField(blank=True),
+ ),
+ ]
diff --git a/submissions/migrations/0051_merge_20170721_0934.py b/submissions/migrations/0051_merge_20170721_0934.py
new file mode 100644
index 000000000..2f8075edd
--- /dev/null
+++ b/submissions/migrations/0051_merge_20170721_0934.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-07-21 07:34
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('submissions', '0050_auto_20170707_2126'),
+ ('submissions', '0048_auto_20170721_0931'),
+ ]
+
+ operations = [
+ ]
--
GitLab