diff --git a/sapl/materia/migrations/0061_auto_20191118_2036.py b/sapl/materia/migrations/0061_auto_20191118_2036.py index adc80e739..76066984b 100644 --- a/sapl/materia/migrations/0061_auto_20191118_2036.py +++ b/sapl/materia/migrations/0061_auto_20191118_2036.py @@ -8,7 +8,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('materia', '0060_auto_20190930_1136'), + ('materia', '0060_auto_20190905_1134'), ] operations = [ diff --git a/sapl/materia/migrations/0064_merge_20191121_1346.py b/sapl/materia/migrations/0064_merge_20191121_1346.py new file mode 100644 index 000000000..043d54da0 --- /dev/null +++ b/sapl/materia/migrations/0064_merge_20191121_1346.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.20 on 2019-11-21 16:46 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('materia', '0063_auto_20191010_1228'), + ('materia', '0061_auto_20191118_2036'), + ] + + operations = [ + ]