From 284b371b2c5ab0da53647c20a92d791d358288e9 Mon Sep 17 00:00:00 2001
From: Edward Ribeiro <eribeiro@interlegis.leg.br>
Date: Thu, 22 Sep 2016 17:52:37 -0300
Subject: [PATCH] Merge migrations

---
 sapl/parlamentares/migrations/0029_merge.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 sapl/parlamentares/migrations/0029_merge.py

diff --git a/sapl/parlamentares/migrations/0029_merge.py b/sapl/parlamentares/migrations/0029_merge.py
new file mode 100644
index 000000000..034f452a4
--- /dev/null
+++ b/sapl/parlamentares/migrations/0029_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-09-22 20:52
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('parlamentares', '0028_auto_20160922_1443'),
+        ('parlamentares', '0028_legislatura_numero'),
+    ]
+
+    operations = [
+    ]