From b458748997a78f7f13a05fd7d1763e0333557109 Mon Sep 17 00:00:00 2001
From: Eliseu Egewarth <eliseuegewarth@gmail.com>
Date: Tue, 5 Sep 2017 16:25:05 -0300
Subject: [PATCH] HOTFIX: Corrige problema de makemigrations --merge ocasionado
 por git rebase

Signed-off-by: Eliseu Egewarth <eliseuegewarth@gmail.com>
---
 ...905_0818.py => 0014_auto_20170905_0818.py} |  2 +-
 .../migrations/0009_auto_20170905_1617.py     | 27 +++++++++++++++++++
 .../migrations/0014_auto_20170905_1617.py     | 23 ++++++++++++++++
 3 files changed, 51 insertions(+), 1 deletion(-)
 rename sapl/materia/migrations/{0013_auto_20170905_0818.py => 0014_auto_20170905_0818.py} (89%)
 create mode 100644 sapl/parlamentares/migrations/0009_auto_20170905_1617.py
 create mode 100644 sapl/sessao/migrations/0014_auto_20170905_1617.py

diff --git a/sapl/materia/migrations/0013_auto_20170905_0818.py b/sapl/materia/migrations/0014_auto_20170905_0818.py
similarity index 89%
rename from sapl/materia/migrations/0013_auto_20170905_0818.py
rename to sapl/materia/migrations/0014_auto_20170905_0818.py
index e784c5e4f..afe266c58 100644
--- a/sapl/materia/migrations/0013_auto_20170905_0818.py
+++ b/sapl/materia/migrations/0014_auto_20170905_0818.py
@@ -8,7 +8,7 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('materia', '0012_auto_20170829_1321'),
+        ('materia', '0013_adiciona_status_tramitacao'),
     ]
 
     operations = [
diff --git a/sapl/parlamentares/migrations/0009_auto_20170905_1617.py b/sapl/parlamentares/migrations/0009_auto_20170905_1617.py
new file mode 100644
index 000000000..1290f069a
--- /dev/null
+++ b/sapl/parlamentares/migrations/0009_auto_20170905_1617.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.13 on 2017-09-05 16:17
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('parlamentares', '0008_adiciona_cargos_mesa'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='situacaomilitar',
+            options={'ordering': ['descricao'], 'verbose_name': 'Tipo Situação Militar', 'verbose_name_plural': 'Tipos Situações Militares'},
+        ),
+        migrations.AlterModelOptions(
+            name='tipoafastamento',
+            options={'ordering': ['descricao'], 'verbose_name': 'Tipo de Afastamento', 'verbose_name_plural': 'Tipos de Afastamento'},
+        ),
+        migrations.AlterModelOptions(
+            name='tipodependente',
+            options={'ordering': ['descricao'], 'verbose_name': 'Tipo de Dependente', 'verbose_name_plural': 'Tipos de Dependente'},
+        ),
+    ]
diff --git a/sapl/sessao/migrations/0014_auto_20170905_1617.py b/sapl/sessao/migrations/0014_auto_20170905_1617.py
new file mode 100644
index 000000000..6568001ee
--- /dev/null
+++ b/sapl/sessao/migrations/0014_auto_20170905_1617.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.13 on 2017-09-05 16:17
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sessao', '0013_merge'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='tipoexpediente',
+            options={'ordering': ['nome'], 'verbose_name': 'Tipo de Expediente', 'verbose_name_plural': 'Tipos de Expediente'},
+        ),
+        migrations.AlterModelOptions(
+            name='tiposessaoplenaria',
+            options={'ordering': ['nome'], 'verbose_name': 'Tipo de Sessão Plenária', 'verbose_name_plural': 'Tipos de Sessão Plenária'},
+        ),
+    ]