diff --git a/sapl/materia/migrations/0062_merge_20191209_1531.py b/sapl/materia/migrations/0062_merge_20191209_1531.py new file mode 100644 index 000000000..857e34e29 --- /dev/null +++ b/sapl/materia/migrations/0062_merge_20191209_1531.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.20 on 2019-12-09 18:31 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('materia', '0061_auto_20191120_1440'), + ('materia', '0061_merge_20191009_1814'), + ] + + operations = [ + ] diff --git a/sapl/norma/migrations/0030_merge_20191209_1531.py b/sapl/norma/migrations/0030_merge_20191209_1531.py new file mode 100644 index 000000000..9fd58f6e4 --- /dev/null +++ b/sapl/norma/migrations/0030_merge_20191209_1531.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.20 on 2019-12-09 18:31 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('norma', '0029_auto_20191024_1344'), + ('norma', '0028_merge_20191009_1814'), + ] + + operations = [ + ] diff --git a/sapl/protocoloadm/migrations/0029_merge_20191209_1531.py b/sapl/protocoloadm/migrations/0029_merge_20191209_1531.py new file mode 100644 index 000000000..99eb021f1 --- /dev/null +++ b/sapl/protocoloadm/migrations/0029_merge_20191209_1531.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.20 on 2019-12-09 18:31 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('protocoloadm', '0028_merge_20191009_1814'), + ('protocoloadm', '0026_auto_20191120_1440'), + ] + + operations = [ + ]