diff --git a/sapl/materia/migrations/0054_merge_20190802_1112.py b/sapl/materia/migrations/0054_merge_20190802_1112.py new file mode 100644 index 000000000..2ee5d755e --- /dev/null +++ b/sapl/materia/migrations/0054_merge_20190802_1112.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.20 on 2019-08-02 14:12 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('materia', '0052_auto_20190712_1053'), + ('materia', '0053_proposicao_ultima_edicao'), + ] + + operations = [ + ] diff --git a/sapl/protocoloadm/migrations/0023_merge_20190802_1112.py b/sapl/protocoloadm/migrations/0023_merge_20190802_1112.py new file mode 100644 index 000000000..421ce4907 --- /dev/null +++ b/sapl/protocoloadm/migrations/0023_merge_20190802_1112.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.20 on 2019-08-02 14:12 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('protocoloadm', '0022_auto_20190712_1053'), + ('protocoloadm', '0022_auto_20190715_1101'), + ] + + operations = [ + ]