new_contents: # -*- coding: utf-8 -*-
  # Generated by Django 1.10.1 on 2017-01-12 21:44
  from __future__ import unicode_literals
  
  from django.db import migrations
  
  
  class Migration(migrations.Migration):
  
      dependencies = [
          ('ovp_organizations', '0014_auto_20170112_1717'),
          ('ovp_organizations', '0013_auto_20170111_1633'),
      ]
  
      operations = [
      ]
  
subject: resolve migration conflict