From ab17e4d6b831262039a7b3a88e524fccce6ebc50 Mon Sep 17 00:00:00 2001
From: Mariana Mendes <mare.s.mendes@gmail.com>
Date: Mon, 26 Feb 2018 07:45:35 -0300
Subject: [PATCH] Resolve conflitos

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

diff --git a/sapl/comissoes/migrations/0005_merge.py b/sapl/comissoes/migrations/0005_merge.py
new file mode 100644
index 000000000..f171eb151
--- /dev/null
+++ b/sapl/comissoes/migrations/0005_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.13 on 2018-02-26 10:41
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('comissoes', '0004_auto_20180102_1652'),
+        ('comissoes', '0003_reuniao'),
+    ]
+
+    operations = [
+    ]