@@ -0,0 +1,340 @@
+# -*- coding: utf-8 -*-%0A# Generated by Django 1.10.1 on 2017-01-12 21:44%0Afrom __future__ import unicode_literals%0A%0Afrom django.db import migrations%0A%0A%0Aclass Migration(migrations.Migration):%0A%0A    dependencies = %5B%0A        ('ovp_core', '0005_auto_20170112_1417'),%0A        ('ovp_core', '0005_auto_20170111_1633'),%0A    %5D%0A%0A    operations = %5B%0A    %5D%0A

resolve migration conflict