From 4530d86029624043c5edcba3e5b71bcc7a2369d5 Mon Sep 17 00:00:00 2001
From: VictorFabreF <victorfabre@me.com>
Date: Thu, 8 Nov 2018 13:54:24 -0200
Subject: [PATCH] Fix migrations conflicts

---
 sapl/sessao/migrations/0028_auto_20181031_0902.py | 2 +-
 sapl/sessao/migrations/0029_auto_20181024_0952.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sapl/sessao/migrations/0028_auto_20181031_0902.py b/sapl/sessao/migrations/0028_auto_20181031_0902.py
index dc9934b9a..30553e8e4 100644
--- a/sapl/sessao/migrations/0028_auto_20181031_0902.py
+++ b/sapl/sessao/migrations/0028_auto_20181031_0902.py
@@ -11,7 +11,7 @@ class Migration(migrations.Migration):
     dependencies = [
         ('materia', '0032_auto_20181022_1743'),
         ('parlamentares', '0025_auto_20180924_1724'),
-        ('sessao', '0027_auto_20181023_1239'),
+        ('sessao', '0028_auto_20181024_0848'),
     ]
 
     operations = [
diff --git a/sapl/sessao/migrations/0029_auto_20181024_0952.py b/sapl/sessao/migrations/0029_auto_20181024_0952.py
index 880486834..8fba1b8ef 100644
--- a/sapl/sessao/migrations/0029_auto_20181024_0952.py
+++ b/sapl/sessao/migrations/0029_auto_20181024_0952.py
@@ -8,7 +8,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('sessao', '0028_auto_20181024_0848'),
+        ('sessao', '0028_auto_20181031_0902'),
     ]
 
     operations = [