From 473c7ccfbd578b9ff48b3772c6a9b53f40c5478d Mon Sep 17 00:00:00 2001
From: LeandroRoberto <leandroroberto.br@gmail.com>
Date: Mon, 19 Sep 2016 12:51:24 -0300
Subject: [PATCH] Merge of makemigrations

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

diff --git a/sapl/comissoes/migrations/0007_merge.py b/sapl/comissoes/migrations/0007_merge.py
new file mode 100644
index 000000000..d2ed51932
--- /dev/null
+++ b/sapl/comissoes/migrations/0007_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-09-19 15:48
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('comissoes', '0006_auto_20160916_1243'),
+        ('comissoes', '0006_auto_20160825_1335'),
+    ]
+
+    operations = [
+    ]