From e9da5c8e96c4857718ddf6d5952549742920cae1 Mon Sep 17 00:00:00 2001
From: Mariana Mendes <mare.s.mendes@gmail.com>
Date: Wed, 24 Oct 2018 08:49:24 -0200
Subject: [PATCH] fixing conflicts with the migration

---
 ...{0027_auto_20181023_1126.py => 0028_auto_20181024_0848.py} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename sapl/sessao/migrations/{0027_auto_20181023_1126.py => 0028_auto_20181024_0848.py} (96%)

diff --git a/sapl/sessao/migrations/0027_auto_20181023_1126.py b/sapl/sessao/migrations/0028_auto_20181024_0848.py
similarity index 96%
rename from sapl/sessao/migrations/0027_auto_20181023_1126.py
rename to sapl/sessao/migrations/0028_auto_20181024_0848.py
index 9d5299154..825b6707e 100644
--- a/sapl/sessao/migrations/0027_auto_20181023_1126.py
+++ b/sapl/sessao/migrations/0028_auto_20181024_0848.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2018-10-23 13:26
+# Generated by Django 1.10.8 on 2018-10-24 10:48
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -11,7 +11,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('parlamentares', '0025_auto_20180924_1724'),
-        ('sessao', '0026_auto_20181016_1944'),
+        ('sessao', '0027_auto_20181023_1239'),
     ]
 
     operations = [