Fix conflit

Ailson da Cruz
1 parent f6bc612b
Showing 1 changed file with 16 additions and 0 deletions Show diff stats
courses/migrations/0014_merge_20160916_0255.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-09-16 05:55
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('courses', '0013_auto_20160916_0001'),
+        ('courses', '0013_auto_20160916_0126'),
+    ]
+
+    operations = [
+    ]
...	...	@@ -0,0 +1,16 @@
	1	+# -- coding: utf-8 --
	2	+# Generated by Django 1.10 on 2016-09-16 05:55
	3	+from __future__ import unicode_literals
	4	+
	5	+from django.db import migrations
	6	+
	7	+
	8	+class Migration(migrations.Migration):
	9	+
	10	+ dependencies = [
	11	+ ('courses', '0013_auto_20160916_0001'),
	12	+ ('courses', '0013_auto_20160916_0126'),
	13	+ ]
	14	+
	15	+ operations = [
	16	+ ]
...	...