@@ -0,0 +1,332 @@
+# -*- coding: utf-8 -*-%0A# Generated by Django 1.11 on 2017-05-09 17:10%0Afrom __future__ import unicode_literals%0A%0Afrom django.db import migrations%0A%0A%0Aclass Migration(migrations.Migration):%0A%0A    dependencies = %5B%0A        ('share', '0032_auto_20170508_1753'),%0A        ('share', '0032_auto_20170508_1931'),%0A    %5D%0A%0A    operations = %5B%0A    %5D%0A

Add merge migration