From 3740d9b3a1fb9011c930d5ad336d3688b3b25a6b Mon Sep 17 00:00:00 2001 From: Victor Fabre Date: Mon, 19 Nov 2018 17:51:56 -0200 Subject: [PATCH] fix migration conflicts --- sapl/sessao/migrations/0030_resumoordenacao_decimo_primeiro.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sapl/sessao/migrations/0030_resumoordenacao_decimo_primeiro.py b/sapl/sessao/migrations/0030_resumoordenacao_decimo_primeiro.py index f284bf715..8bd62e137 100644 --- a/sapl/sessao/migrations/0030_resumoordenacao_decimo_primeiro.py +++ b/sapl/sessao/migrations/0030_resumoordenacao_decimo_primeiro.py @@ -8,7 +8,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('sessao', '0029_auto_20181024_0952'), + ('sessao', '0031_auto_20181116_1849'), ] operations = [