@@ -0,0 +1,338 @@
+# -*- coding: utf-8 -*-%0A# Generated by Django 1.10.5 on 2017-01-16 21:23%0Afrom __future__ import unicode_literals%0A%0Afrom django.db import migrations%0A%0A%0Aclass Migration(migrations.Migration):%0A%0A    dependencies = %5B%0A        ('content', '0032_auto_20170105_0932'),%0A        ('content', '0031_auto_20170112_1000'),%0A    %5D%0A%0A    operations = %5B%0A    %5D%0A

add merge migration