@@ -0,0 +1,341 @@
+# -*- coding: utf-8 -*-%0A# Generated by Django 1.10.5 on 2017-03-21 14:00%0Afrom __future__ import unicode_literals%0A%0Afrom django.db import migrations%0A%0A%0Aclass Migration(migrations.Migration):%0A%0A    dependencies = %5B%0A        ('feedback', '0036_auto_20170319_1423'),%0A        ('feedback', '0032_merge_20170114_1715'),%0A    %5D%0A%0A    operations = %5B%0A    %5D%0A

Add migration merge