From 4aa4303da2e45c6e2d287d7f21f4a765e1cb052d Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Tue, 23 Jan 2018 20:43:18 +0100
Subject: [PATCH] Merge migration streams
---
journals/migrations/0006_merge_20180123_2040.py | 16 ++++++++++++++++
.../migrations/0004_merge_20180123_2041.py | 16 ++++++++++++++++
2 files changed, 32 insertions(+)
create mode 100644 journals/migrations/0006_merge_20180123_2040.py
create mode 100644 submissions/migrations/0004_merge_20180123_2041.py
diff --git a/journals/migrations/0006_merge_20180123_2040.py b/journals/migrations/0006_merge_20180123_2040.py
new file mode 100644
index 000000000..88366b30e
--- /dev/null
+++ b/journals/migrations/0006_merge_20180123_2040.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-01-23 19:40
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('journals', '0004_auto_20180122_2109'),
+ ('journals', '0005_auto_20180122_1003'),
+ ]
+
+ operations = [
+ ]
diff --git a/submissions/migrations/0004_merge_20180123_2041.py b/submissions/migrations/0004_merge_20180123_2041.py
new file mode 100644
index 000000000..4c883fba8
--- /dev/null
+++ b/submissions/migrations/0004_merge_20180123_2041.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-01-23 19:41
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('submissions', '0002_report_report_type'),
+ ('submissions', '0003_auto_20180120_1102'),
+ ]
+
+ operations = [
+ ]
--
GitLab