merge migrations

Matheus Lins
1 parent 7522fcaf
Showing 6 changed files with 80 additions and 6 deletions Show diff stats
core/migrations/0003_merge_20161117_0157.py
courses/migrations/0003_merge_20161117_0157.py
exam/migrations/0003_merge_20161117_0157.py
exercise/migrations/0001_initial.py
forum/migrations/0003_merge_20161117_0157.py
poll/migrations/0003_merge_20161117_0157.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-17 04:57
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0002_auto_20161115_1936'),
+        ('core', '0002_auto_20161117_0009'),
+    ]
+
+    operations = [
+    ]
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-17 04:57
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('courses', '0002_auto_20161115_1936'),
+        ('courses', '0002_auto_20161117_0009'),
+    ]
+
+    operations = [
+    ]
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-17 04:57
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('exam', '0002_auto_20161115_1936'),
+        ('exam', '0002_auto_20161117_0009'),
+    ]
+
+    operations = [
+    ]
 # -*- coding: utf-8 -*-
-<<<<<<< HEAD
-# Generated by Django 1.10 on 2016-11-17 04:25
-=======
-
-# Generated by Django 1.10 on 2016-11-15 22:36
->>>>>>> b869409bd7972f90e6cd67f9456afc8a04b9fce3
 from __future__ import unicode_literals
  
 from decimal import Decimal
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-17 04:57
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('forum', '0002_auto_20161115_1936'),
+        ('forum', '0002_auto_20161117_0009'),
+    ]
+
+    operations = [
+    ]
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-17 04:57
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('poll', '0002_auto_20161115_1936'),
+        ('poll', '0002_auto_20161117_0009'),
+    ]
+
+    operations = [
+    ]
...	...	@@ -0,0 +1,16 @@
	1	+# -- coding: utf-8 --
	2	+# Generated by Django 1.10 on 2016-11-17 04:57
	3	+from __future__ import unicode_literals
	4	+
	5	+from django.db import migrations
	6	+
	7	+
	8	+class Migration(migrations.Migration):
	9	+
	10	+ dependencies = [
	11	+ ('core', '0002_auto_20161115_1936'),
	12	+ ('core', '0002_auto_20161117_0009'),
	13	+ ]
	14	+
	15	+ operations = [
	16	+ ]
...	...
1	1	# -- coding: utf-8 --
2		-<<<<<<< HEAD
3		-# Generated by Django 1.10 on 2016-11-17 04:25
4		-=======
5		-
6		-# Generated by Django 1.10 on 2016-11-15 22:36
7		->>>>>>> b869409bd7972f90e6cd67f9456afc8a04b9fce3
8	2	from __future__ import unicode_literals
9	3
10	4	from decimal import Decimal
...	...