HOTFIX: Corrige problema de makemigrations --merge ocasionado por git rebase

Signed-off-by: Eliseu Egewarth <eliseuegewarth@gmail.com>

sapl/materia/migrations/0013_auto_20170905_0818.py → 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 = [

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'},
+        ),
+    ]

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'},
+        ),
+    ]