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

from django.db import models, migrations


class Migration(migrations.Migration):

    dependencies = [
        ('dashboard', '0019_auto_20150423_1100'),
        ('dashboard', '0021_merge'),
    ]

    operations = [
    ]

add merge migration