diff --git a/digital_glarus/migrations/0003_merge.py b/digital_glarus/migrations/0003_merge.py new file mode 100644 index 00000000..49e26d1c --- /dev/null +++ b/digital_glarus/migrations/0003_merge.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('digital_glarus', '0002_auto_20150522_0450'), + ('digital_glarus', '0002_auto_20150527_1023'), + ] + + operations = [ + ]