@@ -0,0 +1,334 @@
+# -*- coding: utf-8 -*-%0A# Generated by Django 1.10.1 on 2016-11-13 02:32%0Afrom __future__ import unicode_literals%0A%0Afrom django.db import migrations%0A%0A%0Aclass Migration(migrations.Migration):%0A%0A    dependencies = %5B%0A        ('board', '0024_auto_20161113_0118'),%0A        ('board', '0024_auto_20161111_2006'),%0A    %5D%0A%0A    operations = %5B%0A    %5D%0A

Resolve migrations conflict