From d314b36a7728ecb2cbcea20e75f6a211dc7f480c Mon Sep 17 00:00:00 2001
From: Luciano Almeida <lucianoalmeida@interlegis.leg.br>
Date: Tue, 19 Apr 2016 15:14:34 -0300
Subject: [PATCH] Arruma problema de merge no makemigrations

Signed-off-by: Luciano Almeida <lucianoalmeida@interlegis.leg.br>
---
 materia/migrations/0029_merge.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 materia/migrations/0029_merge.py

diff --git a/materia/migrations/0029_merge.py b/materia/migrations/0029_merge.py
new file mode 100644
index 000000000..3a37b2421
--- /dev/null
+++ b/materia/migrations/0029_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.5 on 2016-04-19 18:02
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('materia', '0028_auto_20160419_1056'),
+        ('materia', '0028_auto_20160419_1000'),
+    ]
+
+    operations = [
+    ]