From 2dfcac00dc68b023eca69348318a6884504e6115 Mon Sep 17 00:00:00 2001
From: Cesar Carvalho <cesaraugc@gmail.com>
Date: Wed, 4 Dec 2019 11:33:04 -0300
Subject: [PATCH] Fix migrations na master

---
 .../migrations/0041_auto_20191204_1130.py     | 20 +++++++++++++++++++
 .../migrations/0065_merge_20191204_1129.py    | 16 +++++++++++++++
 .../migrations/0030_merge_20191204_1129.py    | 16 +++++++++++++++
 .../migrations/0051_merge_20191204_1129.py    | 16 +++++++++++++++
 4 files changed, 68 insertions(+)
 create mode 100644 sapl/base/migrations/0041_auto_20191204_1130.py
 create mode 100644 sapl/materia/migrations/0065_merge_20191204_1129.py
 create mode 100644 sapl/norma/migrations/0030_merge_20191204_1129.py
 create mode 100644 sapl/sessao/migrations/0051_merge_20191204_1129.py

diff --git a/sapl/base/migrations/0041_auto_20191204_1130.py b/sapl/base/migrations/0041_auto_20191204_1130.py
new file mode 100644
index 000000000..fa6cd6b98
--- /dev/null
+++ b/sapl/base/migrations/0041_auto_20191204_1130.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-12-04 14:30
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0040_merge_20191030_1655'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='appconfig',
+            name='assinatura_ata',
+            field=models.CharField(choices=[('M', 'Mesa Diretora da Sessão'), ('P', 'Apenas o Presidente da Sessão'), ('T', 'Todos os Parlamentares Presentes na Sessão')], default='T', max_length=1, verbose_name='Quem deve assinar a ata'),
+        ),
+    ]
diff --git a/sapl/materia/migrations/0065_merge_20191204_1129.py b/sapl/materia/migrations/0065_merge_20191204_1129.py
new file mode 100644
index 000000000..13a6aab50
--- /dev/null
+++ b/sapl/materia/migrations/0065_merge_20191204_1129.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-12-04 14:29
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('materia', '0061_auto_20191120_1440'),
+        ('materia', '0064_merge_20191121_1346'),
+    ]
+
+    operations = [
+    ]
diff --git a/sapl/norma/migrations/0030_merge_20191204_1129.py b/sapl/norma/migrations/0030_merge_20191204_1129.py
new file mode 100644
index 000000000..2327472ff
--- /dev/null
+++ b/sapl/norma/migrations/0030_merge_20191204_1129.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-12-04 14:29
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('norma', '0029_auto_20191024_1344'),
+        ('norma', '0028_merge_20191003_0909'),
+    ]
+
+    operations = [
+    ]
diff --git a/sapl/sessao/migrations/0051_merge_20191204_1129.py b/sapl/sessao/migrations/0051_merge_20191204_1129.py
new file mode 100644
index 000000000..8963a9f06
--- /dev/null
+++ b/sapl/sessao/migrations/0051_merge_20191204_1129.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-12-04 14:29
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sessao', '0048_auto_20190829_1253'),
+        ('sessao', '0050_auto_20191029_1441'),
+    ]
+
+    operations = [
+    ]