From 4d58c6639dd5b7360e258ec45758fac69e38fe4b Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Sat, 24 Jun 2017 19:44:25 +0200
Subject: [PATCH] Fix migrations merge
---
partners/migrations/0018_merge_20170624_1943.py | 16 ++++++++++++++++
scipost/migrations/0057_merge_20170624_1943.py | 16 ++++++++++++++++
2 files changed, 32 insertions(+)
create mode 100644 partners/migrations/0018_merge_20170624_1943.py
create mode 100644 scipost/migrations/0057_merge_20170624_1943.py
diff --git a/partners/migrations/0018_merge_20170624_1943.py b/partners/migrations/0018_merge_20170624_1943.py
new file mode 100644
index 000000000..04770cb31
--- /dev/null
+++ b/partners/migrations/0018_merge_20170624_1943.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-06-24 17:43
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('partners', '0017_auto_20170624_1358'),
+ ('partners', '0013_auto_20170623_0806'),
+ ]
+
+ operations = [
+ ]
diff --git a/scipost/migrations/0057_merge_20170624_1943.py b/scipost/migrations/0057_merge_20170624_1943.py
new file mode 100644
index 000000000..bb2fb8d66
--- /dev/null
+++ b/scipost/migrations/0057_merge_20170624_1943.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-06-24 17:43
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('scipost', '0056_auto_20170623_0806'),
+ ('scipost', '0056_auto_20170619_2049'),
+ ]
+
+ operations = [
+ ]
--
GitLab