@@ -0,0 +1,346 @@
+# -*- coding: utf-8 -*-%0A# Generated by Django 1.11.4 on 2017-09-28 14:42%0Afrom __future__ import unicode_literals%0A%0Afrom django.db import migrations%0A%0A%0Aclass Migration(migrations.Migration):%0A%0A    dependencies = %5B%0A        ('usermanage', '0007_merge_20170928_1237'),%0A        ('usermanage', '0007_merge_20170928_1222'),%0A    %5D%0A%0A    operations = %5B%0A    %5D%0A

fix conflict