From 84d2e1a5ee57aff2238343133f2efb1c57c7ecbc Mon Sep 17 00:00:00 2001
From: Edward Ribeiro <eribeiro@interlegis.leg.br>
Date: Wed, 30 Oct 2019 16:55:52 -0300
Subject: [PATCH] HOT-FIX: merge de migrations

---
 sapl/base/migrations/0040_merge_20191030_1655.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 sapl/base/migrations/0040_merge_20191030_1655.py

diff --git a/sapl/base/migrations/0040_merge_20191030_1655.py b/sapl/base/migrations/0040_merge_20191030_1655.py
new file mode 100644
index 000000000..a9f1d2e39
--- /dev/null
+++ b/sapl/base/migrations/0040_merge_20191030_1655.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-10-30 19:55
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0038_auditlog'),
+        ('base', '0039_auto_20190913_1228'),
+    ]
+
+    operations = [
+    ]