diff --git a/common/migrations/0015_merge.py b/common/migrations/0015_merge.py new file mode 100644 index 0000000..7cb3d4b --- /dev/null +++ b/common/migrations/0015_merge.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-09-07 14:05 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('common', '0014_auto_20160906_1713'), + ('common', '0014_auto_20160907_1101'), + ] + + operations = [ + ]