From 2c453ad4ddc77fb35ae6255ae2a835329eda743a Mon Sep 17 00:00:00 2001
From: Cesar Carvalho <cesaraugc@gmail.com>
Date: Mon, 29 Apr 2019 15:32:35 -0300
Subject: [PATCH] HOT-FIX: Merge das migrations

---
 .../migrations/0021_merge_20190429_1531.py       | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 sapl/protocoloadm/migrations/0021_merge_20190429_1531.py

diff --git a/sapl/protocoloadm/migrations/0021_merge_20190429_1531.py b/sapl/protocoloadm/migrations/0021_merge_20190429_1531.py
new file mode 100644
index 000000000..4613b46ce
--- /dev/null
+++ b/sapl/protocoloadm/migrations/0021_merge_20190429_1531.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-04-29 18:31
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('protocoloadm', '0020_tramitacaoadministrativo_timestamp'),
+        ('protocoloadm', '0019_auto_20190426_0833'),
+    ]
+
+    operations = [
+    ]