From aeec3fc4b5a1ed8f8ecf3c1c4abebe8eb96bebbf Mon Sep 17 00:00:00 2001
From: Edward Ribeiro <eribeiro@interlegis.leg.br>
Date: Thu, 19 May 2016 14:04:24 -0300
Subject: [PATCH] HOT-FIX: faz o merge de migration do protocoloadm

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

diff --git a/protocoloadm/migrations/0013_merge.py b/protocoloadm/migrations/0013_merge.py
new file mode 100644
index 000000000..af5341f83
--- /dev/null
+++ b/protocoloadm/migrations/0013_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.5 on 2016-05-19 17:03
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('protocoloadm', '0012_tipoinstituicao'),
+        ('protocoloadm', '0012_auto_20160503_0926'),
+    ]
+
+    operations = [
+    ]