From 2e742844d40b72a59360a3000917cb7ba4100a32 Mon Sep 17 00:00:00 2001
From: Edward Ribeiro <eribeiro@interlegis.leg.br>
Date: Wed, 9 Oct 2019 16:07:50 -0300
Subject: [PATCH] =?UTF-8?q?HOT-FIX:=20conserta=20migra=C3=A7=C3=A3o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sessao/migrations/0047_auto_20190829_1253.py |  1 +
 .../migrations/0048_merge_20191009_1322.py       | 16 ----------------
 2 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 sapl/sessao/migrations/0048_merge_20191009_1322.py

diff --git a/sapl/sessao/migrations/0047_auto_20190829_1253.py b/sapl/sessao/migrations/0047_auto_20190829_1253.py
index 277233e37..ba9a41753 100644
--- a/sapl/sessao/migrations/0047_auto_20190829_1253.py
+++ b/sapl/sessao/migrations/0047_auto_20190829_1253.py
@@ -9,6 +9,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('sessao', '0046_auto_20190827_1228'),
+        ('sessao', '0046_auto_20191001_1115'),
     ]
 
     operations = [
diff --git a/sapl/sessao/migrations/0048_merge_20191009_1322.py b/sapl/sessao/migrations/0048_merge_20191009_1322.py
deleted file mode 100644
index 5941cb8a7..000000000
--- a/sapl/sessao/migrations/0048_merge_20191009_1322.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-10-09 16:22
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('sessao', '0047_auto_20190829_1253'),
-        ('sessao', '0046_auto_20191001_1115'),
-    ]
-
-    operations = [
-    ]