From e037189a970258d41a219421bcf5a43fda1bb364 Mon Sep 17 00:00:00 2001
From: Edward Ribeiro <eribeiro@interlegis.leg.br>
Date: Fri, 26 Feb 2016 11:25:32 -0300
Subject: [PATCH] Merge migrations

---
 materia/migrations/0018_merge.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 materia/migrations/0018_merge.py

diff --git a/materia/migrations/0018_merge.py b/materia/migrations/0018_merge.py
new file mode 100644
index 000000000..082356b16
--- /dev/null
+++ b/materia/migrations/0018_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2016-02-26 14:25
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('materia', '0017_acompanhamentomateria_confirmado'),
+        ('materia', '0016_auto_20160225_0918'),
+    ]
+
+    operations = [
+    ]