From f6e4df20b23bbd32c9d6472120d445e0ddaf060f Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Sun, 30 Jul 2017 09:35:56 +0200
Subject: [PATCH] Fix merge conflict
---
partners/migrations/0030_merge_20170730_0935.py | 16 ++++++++++++++++
scipost/migrations/0061_merge_20170730_0935.py | 16 ++++++++++++++++
2 files changed, 32 insertions(+)
create mode 100644 partners/migrations/0030_merge_20170730_0935.py
create mode 100644 scipost/migrations/0061_merge_20170730_0935.py
diff --git a/partners/migrations/0030_merge_20170730_0935.py b/partners/migrations/0030_merge_20170730_0935.py
new file mode 100644
index 000000000..547d6f7ee
--- /dev/null
+++ b/partners/migrations/0030_merge_20170730_0935.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-07-30 07:35
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('partners', '0028_merge_20170721_1419'),
+ ('partners', '0029_merge_20170726_0945'),
+ ]
+
+ operations = [
+ ]
diff --git a/scipost/migrations/0061_merge_20170730_0935.py b/scipost/migrations/0061_merge_20170730_0935.py
new file mode 100644
index 000000000..2869252d9
--- /dev/null
+++ b/scipost/migrations/0061_merge_20170730_0935.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-07-30 07:35
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('scipost', '0060_auto_20170726_1612'),
+ ('scipost', '0060_merge_20170708_0941'),
+ ]
+
+ operations = [
+ ]
--
GitLab