From 6d77d6df1e879a9851fbbb48868b9e675f7da9d3 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Sat, 8 Jul 2017 09:43:16 +0200
Subject: [PATCH] Fix merge conflict
---
partners/migrations/0027_merge_20170708_0941.py | 16 ++++++++++++++++
scipost/migrations/0060_merge_20170708_0941.py | 16 ++++++++++++++++
2 files changed, 32 insertions(+)
create mode 100644 partners/migrations/0027_merge_20170708_0941.py
create mode 100644 scipost/migrations/0060_merge_20170708_0941.py
diff --git a/partners/migrations/0027_merge_20170708_0941.py b/partners/migrations/0027_merge_20170708_0941.py
new file mode 100644
index 000000000..39238261e
--- /dev/null
+++ b/partners/migrations/0027_merge_20170708_0941.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-07-08 07:41
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('partners', '0026_auto_20170627_1809'),
+ ('partners', '0012_auto_20170618_2024'),
+ ]
+
+ operations = [
+ ]
diff --git a/scipost/migrations/0060_merge_20170708_0941.py b/scipost/migrations/0060_merge_20170708_0941.py
new file mode 100644
index 000000000..3e5149228
--- /dev/null
+++ b/scipost/migrations/0060_merge_20170708_0941.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-07-08 07:41
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('scipost', '0056_auto_20170618_2024'),
+ ('scipost', '0059_auto_20170701_1356'),
+ ]
+
+ operations = [
+ ]
--
GitLab