From 9bb0394696a52233c7adfc0b9f948be1d53879d7 Mon Sep 17 00:00:00 2001
From: Edward Ribeiro <eribeiro@interlegis.leg.br>
Date: Tue, 14 Jan 2020 11:20:33 -0300
Subject: [PATCH] Ajusta migrations master

---
 .../migrations/0063_auto_20191220_1351.py     | 21 -------------------
 ...17_1538.py => 0064_merge_20200114_1119.py} |  4 ++--
 .../0064_remove_tramitacao_turno.py           | 19 -----------------
 3 files changed, 2 insertions(+), 42 deletions(-)
 delete mode 100644 sapl/materia/migrations/0063_auto_20191220_1351.py
 rename sapl/materia/migrations/{0065_merge_20191217_1538.py => 0064_merge_20200114_1119.py} (70%)
 delete mode 100644 sapl/materia/migrations/0064_remove_tramitacao_turno.py

diff --git a/sapl/materia/migrations/0063_auto_20191220_1351.py b/sapl/materia/migrations/0063_auto_20191220_1351.py
deleted file mode 100644
index 77194a87c..000000000
--- a/sapl/materia/migrations/0063_auto_20191220_1351.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-12-20 16:51
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('materia', '0062_merge_20191209_1531'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='pautareuniao',
-            name='materia',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='materia_set', to='materia.MateriaLegislativa', verbose_name='Matéria'),
-        ),
-    ]
diff --git a/sapl/materia/migrations/0065_merge_20191217_1538.py b/sapl/materia/migrations/0064_merge_20200114_1119.py
similarity index 70%
rename from sapl/materia/migrations/0065_merge_20191217_1538.py
rename to sapl/materia/migrations/0064_merge_20200114_1119.py
index a8be7ccb6..755ed81a5 100644
--- a/sapl/materia/migrations/0065_merge_20191217_1538.py
+++ b/sapl/materia/migrations/0064_merge_20200114_1119.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-12-17 18:38
+# Generated by Django 1.11.20 on 2020-01-14 14:19
 from __future__ import unicode_literals
 
 from django.db import migrations
@@ -8,7 +8,7 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('materia', '0064_remove_tramitacao_turno'),
+        ('materia', '0063_auto_20190905_1135'),
         ('materia', '0061_merge_20191009_1814'),
     ]
 
diff --git a/sapl/materia/migrations/0064_remove_tramitacao_turno.py b/sapl/materia/migrations/0064_remove_tramitacao_turno.py
deleted file mode 100644
index 657f87bbe..000000000
--- a/sapl/materia/migrations/0064_remove_tramitacao_turno.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-09-06 13:02
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('materia', '0063_auto_20190905_1135')
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='tramitacao',
-            name='turno',
-        ),
-    ]