diff --git a/sapl/materia/migrations/0037_merge_20190108_1538.py b/sapl/materia/migrations/0037_merge_20190108_1538.py new file mode 100644 index 000000000..b10cea06a --- /dev/null +++ b/sapl/materia/migrations/0037_merge_20190108_1538.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2019-01-08 17:38 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('materia', '0036_auto_20190106_0330'), + ('materia', '0034_auto_20190107_1402'), + ] + + operations = [ + ] diff --git a/sapl/norma/migrations/0021_merge_20190108_1538.py b/sapl/norma/migrations/0021_merge_20190108_1538.py new file mode 100644 index 000000000..b301ca851 --- /dev/null +++ b/sapl/norma/migrations/0021_merge_20190108_1538.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2019-01-08 17:38 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('norma', '0020_auto_20190107_1407'), + ('norma', '0020_auto_20190106_0454'), + ] + + operations = [ + ] diff --git a/sapl/protocoloadm/migrations/0014_merge_20190108_1538.py b/sapl/protocoloadm/migrations/0014_merge_20190108_1538.py new file mode 100644 index 000000000..cc19a283b --- /dev/null +++ b/sapl/protocoloadm/migrations/0014_merge_20190108_1538.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2019-01-08 17:38 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('protocoloadm', '0011_auto_20190107_1407'), + ('protocoloadm', '0013_auto_20190106_1336'), + ] + + operations = [ + ]