# -*- coding: utf-8 -*-
from __future__ import unicode_literals

from django.db import models, migrations


class Migration(migrations.Migration):

    dependencies = [
        ('survey', '0021_auto_20150506_1922'),
        ('survey', '0021_auto_20150506_1406'),
    ]

    operations = [
    ]

Resolve migration conflict via merge
Resolve migration conflict via merge
