From ec26fb113633749c211d7e5ce803836604c65b8c Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Sat, 19 May 2018 13:08:15 +0200
Subject: [PATCH] Merge migrations
---
journals/migrations/0029_merge_20180519_1308.py | 16 ++++++++++++++++
.../migrations/0022_merge_20180519_1308.py | 16 ++++++++++++++++
2 files changed, 32 insertions(+)
create mode 100644 journals/migrations/0029_merge_20180519_1308.py
create mode 100644 submissions/migrations/0022_merge_20180519_1308.py
diff --git a/journals/migrations/0029_merge_20180519_1308.py b/journals/migrations/0029_merge_20180519_1308.py
new file mode 100644
index 000000000..aee7261a6
--- /dev/null
+++ b/journals/migrations/0029_merge_20180519_1308.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-05-19 11:08
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('journals', '0028_publication_number_of_citations'),
+ ('journals', '0028_merge_20180426_1023'),
+ ]
+
+ operations = [
+ ]
diff --git a/submissions/migrations/0022_merge_20180519_1308.py b/submissions/migrations/0022_merge_20180519_1308.py
new file mode 100644
index 000000000..a838be818
--- /dev/null
+++ b/submissions/migrations/0022_merge_20180519_1308.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-05-19 11:08
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('submissions', '0021_auto_20180502_2029'),
+ ('submissions', '0012_auto_20180519_1047'),
+ ]
+
+ operations = [
+ ]
--
GitLab