diff --git a/sapl/materia/migrations/0076_merge.py b/sapl/materia/migrations/0076_merge.py new file mode 100644 index 000000000..49ae8f130 --- /dev/null +++ b/sapl/materia/migrations/0076_merge.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2017-03-03 16:34 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('materia', '0075_auto_20170203_1019'), + ('materia', '0075_auto_20170123_1548'), + ] + + operations = [ + ] diff --git a/sapl/norma/migrations/0036_merge.py b/sapl/norma/migrations/0036_merge.py new file mode 100644 index 000000000..207c3b3c0 --- /dev/null +++ b/sapl/norma/migrations/0036_merge.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2017-03-03 16:34 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('norma', '0035_auto_20170222_1438'), + ('norma', '0033_auto_20170123_1548'), + ] + + operations = [ + ] diff --git a/sapl/protocoloadm/migrations/0011_merge.py b/sapl/protocoloadm/migrations/0011_merge.py new file mode 100644 index 000000000..10ea183c3 --- /dev/null +++ b/sapl/protocoloadm/migrations/0011_merge.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2017-03-03 16:34 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('protocoloadm', '0010_auto_20170203_1019'), + ('protocoloadm', '0010_auto_20170123_1548'), + ] + + operations = [ + ]