@@ -0,0 +1,327 @@
+# -*- coding: utf-8 -*-%0A# Generated by Django 1.9.4 on 2016-03-17 17:55%0Afrom __future__ import unicode_literals%0A%0Afrom django.db import migrations%0A%0A%0Aclass Migration(migrations.Migration):%0A%0A    dependencies = %5B%0A        ('qa', '0024_auto_20160317_1738'),%0A        ('qa', '0024_auto_20160317_1643'),%0A    %5D%0A%0A    operations = %5B%0A    %5D%0A

Add conflicting migrations