From 234e8da72fa549d586c15bde943c75d17b26c14b Mon Sep 17 00:00:00 2001
From: Cesar Carvalho <cesaraugc@gmail.com>
Date: Fri, 2 Aug 2019 09:55:25 -0300
Subject: [PATCH] Merge migrations

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

diff --git a/sapl/parlamentares/migrations/0035_merge_20190802_0954.py b/sapl/parlamentares/migrations/0035_merge_20190802_0954.py
new file mode 100644
index 000000000..a87db9134
--- /dev/null
+++ b/sapl/parlamentares/migrations/0035_merge_20190802_0954.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-08-02 12:54
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('parlamentares', '0033_auto_20190712_1132'),
+        ('parlamentares', '0034_auto_20190801_1408'),
+    ]
+
+    operations = [
+    ]