From 7632ce560cf8e8e166699f9558f9f9cac4111f36 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Wed, 4 Oct 2017 19:50:34 +0200
Subject: [PATCH] Fix merging issues
---
partners/migrations/0033_auto_20171003_1512.py | 6 ------
partners/migrations/0034_merge_20171004_1946.py | 16 ++++++++++++++++
.../migrations/0027_merge_20171004_1947.py | 16 ++++++++++++++++
3 files changed, 32 insertions(+), 6 deletions(-)
create mode 100644 partners/migrations/0034_merge_20171004_1946.py
create mode 100644 production/migrations/0027_merge_20171004_1947.py
diff --git a/partners/migrations/0033_auto_20171003_1512.py b/partners/migrations/0033_auto_20171003_1512.py
index e66573296..7920006ce 100644
--- a/partners/migrations/0033_auto_20171003_1512.py
+++ b/partners/migrations/0033_auto_20171003_1512.py
@@ -3,7 +3,6 @@
from __future__ import unicode_literals
from django.db import migrations, models
-import partners.storage
class Migration(migrations.Migration):
@@ -13,9 +12,4 @@ class Migration(migrations.Migration):
]
operations = [
- migrations.AlterField(
- model_name='partnersattachment',
- name='attachment',
- field=models.FileField(storage=partners.storage.SecureFileStorage(), upload_to='UPLOADS/PARTNERS/ATTACHMENTS'),
- ),
]
diff --git a/partners/migrations/0034_merge_20171004_1946.py b/partners/migrations/0034_merge_20171004_1946.py
new file mode 100644
index 000000000..872f84b7f
--- /dev/null
+++ b/partners/migrations/0034_merge_20171004_1946.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2017-10-04 17:46
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('partners', '0033_auto_20171003_1512'),
+ ('partners', '0033_auto_20170930_2230'),
+ ]
+
+ operations = [
+ ]
diff --git a/production/migrations/0027_merge_20171004_1947.py b/production/migrations/0027_merge_20171004_1947.py
new file mode 100644
index 000000000..f9eba172c
--- /dev/null
+++ b/production/migrations/0027_merge_20171004_1947.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2017-10-04 17:47
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('production', '0022_auto_20171003_1525'),
+ ('production', '0026_proof_accessible_for_authors'),
+ ]
+
+ operations = [
+ ]
--
GitLab