From 474fa449ca0c49b164fd23dcbf5b3c7ba627c132 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Mon, 24 Jul 2017 18:40:37 +0200
Subject: [PATCH] Fix migration merge conflict
---
partners/migrations/0028_merge_20170724_1840.py | 16 ++++++++++++++++
.../migrations/0057_merge_20170724_1840.py | 16 ++++++++++++++++
2 files changed, 32 insertions(+)
create mode 100644 partners/migrations/0028_merge_20170724_1840.py
create mode 100644 submissions/migrations/0057_merge_20170724_1840.py
diff --git a/partners/migrations/0028_merge_20170724_1840.py b/partners/migrations/0028_merge_20170724_1840.py
new file mode 100644
index 000000000..9f4c6d014
--- /dev/null
+++ b/partners/migrations/0028_merge_20170724_1840.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-07-24 16:40
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('partners', '0027_merge_20170707_1857'),
+ ('partners', '0027_membershipagreement_end_date'),
+ ]
+
+ operations = [
+ ]
diff --git a/submissions/migrations/0057_merge_20170724_1840.py b/submissions/migrations/0057_merge_20170724_1840.py
new file mode 100644
index 000000000..4aadf6b7e
--- /dev/null
+++ b/submissions/migrations/0057_merge_20170724_1840.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-07-24 16:40
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('submissions', '0056_auto_20170724_1818'),
+ ('submissions', '0051_merge_20170721_0934'),
+ ]
+
+ operations = [
+ ]
--
GitLab