From 00a666afb8ca322213026e29e3d0a5b25b8a0687 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vin=C3=ADcius=20Cantu=C3=A1ria?= <cantuariavc@gmail.com>
Date: Mon, 15 Apr 2019 18:01:46 -0300
Subject: [PATCH] =?UTF-8?q?Corrige=20conflito=20de=20migra=C3=A7=C3=A3o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../migrations/0038_merge_20190415_1800.py       | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 sapl/sessao/migrations/0038_merge_20190415_1800.py

diff --git a/sapl/sessao/migrations/0038_merge_20190415_1800.py b/sapl/sessao/migrations/0038_merge_20190415_1800.py
new file mode 100644
index 000000000..0bf3ab4ea
--- /dev/null
+++ b/sapl/sessao/migrations/0038_merge_20190415_1800.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-04-15 21:00
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sessao', '0037_auto_20190415_1635'),
+        ('sessao', '0037_auto_20190415_1324'),
+    ]
+
+    operations = [
+    ]