From 091f579dc55d8da985d41dbe622192538d8390c1 Mon Sep 17 00:00:00 2001
From: Mariana Mendes <mare.s.mendes@gmail.com>
Date: Tue, 15 Aug 2017 13:44:12 -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

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

diff --git a/sapl/sessao/migrations/0013_merge.py b/sapl/sessao/migrations/0013_merge.py
new file mode 100644
index 000000000..e7d2d8deb
--- /dev/null
+++ b/sapl/sessao/migrations/0013_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.13 on 2017-08-15 13:42
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sessao', '0012_auto_20170814_1615'),
+        ('sessao', '0012_auto_20170815_1244'),
+    ]
+
+    operations = [
+    ]