diff --git a/journals/migrations/0006_merge_20180123_2040.py b/journals/migrations/0006_merge_20180123_2040.py new file mode 100644 index 0000000000000000000000000000000000000000..88366b30e6f7401626337b4804e1f9ec03d641bb --- /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 0000000000000000000000000000000000000000..4c883fba8cd0358ce35cc1ba47ea3df655542504 --- /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 = [ + ]