From 51d3f448203343cc8b05742e93c95b119314ac85 Mon Sep 17 00:00:00 2001
From: Matheus Lins <msl@cin.ufpe.br>
Date: Thu, 17 Nov 2016 01:58:05 -0300
Subject: [PATCH] merge migrations

---
 core/migrations/0003_merge_20161117_0157.py    | 16 ++++++++++++++++
 courses/migrations/0003_merge_20161117_0157.py | 16 ++++++++++++++++
 exam/migrations/0003_merge_20161117_0157.py    | 16 ++++++++++++++++
 exercise/migrations/0001_initial.py            |  6 ------
 forum/migrations/0003_merge_20161117_0157.py   | 16 ++++++++++++++++
 poll/migrations/0003_merge_20161117_0157.py    | 16 ++++++++++++++++
 6 files changed, 80 insertions(+), 6 deletions(-)
 create mode 100644 core/migrations/0003_merge_20161117_0157.py
 create mode 100644 courses/migrations/0003_merge_20161117_0157.py
 create mode 100644 exam/migrations/0003_merge_20161117_0157.py
 create mode 100644 forum/migrations/0003_merge_20161117_0157.py
 create mode 100644 poll/migrations/0003_merge_20161117_0157.py

diff --git a/core/migrations/0003_merge_20161117_0157.py b/core/migrations/0003_merge_20161117_0157.py
new file mode 100644
index 0000000..5c26a4a
--- /dev/null
+++ b/core/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 = [
+    ]
diff --git a/courses/migrations/0003_merge_20161117_0157.py b/courses/migrations/0003_merge_20161117_0157.py
new file mode 100644
index 0000000..6bc869c
--- /dev/null
+++ b/courses/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 = [
+        ('courses', '0002_auto_20161115_1936'),
+        ('courses', '0002_auto_20161117_0009'),
+    ]
+
+    operations = [
+    ]
diff --git a/exam/migrations/0003_merge_20161117_0157.py b/exam/migrations/0003_merge_20161117_0157.py
new file mode 100644
index 0000000..2a388ca
--- /dev/null
+++ b/exam/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 = [
+        ('exam', '0002_auto_20161115_1936'),
+        ('exam', '0002_auto_20161117_0009'),
+    ]
+
+    operations = [
+    ]
diff --git a/exercise/migrations/0001_initial.py b/exercise/migrations/0001_initial.py
index 1282665..0cbf8dd 100644
--- a/exercise/migrations/0001_initial.py
+++ b/exercise/migrations/0001_initial.py
@@ -1,10 +1,4 @@
 # -*- 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
diff --git a/forum/migrations/0003_merge_20161117_0157.py b/forum/migrations/0003_merge_20161117_0157.py
new file mode 100644
index 0000000..e97e64e
--- /dev/null
+++ b/forum/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 = [
+        ('forum', '0002_auto_20161115_1936'),
+        ('forum', '0002_auto_20161117_0009'),
+    ]
+
+    operations = [
+    ]
diff --git a/poll/migrations/0003_merge_20161117_0157.py b/poll/migrations/0003_merge_20161117_0157.py
new file mode 100644
index 0000000..0205a63
--- /dev/null
+++ b/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 = [
+        ('poll', '0002_auto_20161115_1936'),
+        ('poll', '0002_auto_20161117_0009'),
+    ]
+
+    operations = [
+    ]
--
libgit2 0.21.2