diff --git a/biscuit/apps/chronos/migrations/0011_merge_20191113_1655.py b/biscuit/apps/chronos/migrations/0011_merge_20191113_1655.py new file mode 100644 index 0000000000000000000000000000000000000000..91d52bea14baca8a9ac6fa7a49754cc7836cc50e --- /dev/null +++ b/biscuit/apps/chronos/migrations/0011_merge_20191113_1655.py @@ -0,0 +1,13 @@ +# Generated by Django 2.2.6 on 2019-11-13 15:55 + +from django.db import migrations + + +class Migration(migrations.Migration): + dependencies = [ + ('timetable', '0010_auto_20190818_0910'), + ('timetable', '0010_auto_20190825_1238'), + ] + + operations = [ + ]