From 5d670cdfebd1d1620016e58525afca4b15b4459b Mon Sep 17 00:00:00 2001
From: Cesar Carvalho <cesaraugc@gmail.com>
Date: Fri, 12 Apr 2019 08:05:20 -0300
Subject: [PATCH] HOT-FIX: Corrige conflito de migracoes

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

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