From 1039881b4f4cf0295e58d0aa53a329fe8f4f1d57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ses=C3=B3stris=20Vieira?= <sesostris@interlegis.leg.br>
Date: Tue, 4 Jan 2022 12:48:51 -0300
Subject: [PATCH] =?UTF-8?q?Resolve=20conflitos=20de=20migra=C3=A7=C3=A3o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sigi/apps/diagnosticos/migrations/0006_merge.py | 15 +++++++++++++++
 sigi/apps/eventos/migrations/0016_merge.py      | 15 +++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 sigi/apps/diagnosticos/migrations/0006_merge.py
 create mode 100644 sigi/apps/eventos/migrations/0016_merge.py

diff --git a/sigi/apps/diagnosticos/migrations/0006_merge.py b/sigi/apps/diagnosticos/migrations/0006_merge.py
new file mode 100644
index 0000000..ae7feba
--- /dev/null
+++ b/sigi/apps/diagnosticos/migrations/0006_merge.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('diagnosticos', '0002_auto_20160719_0920'),
+        ('diagnosticos', '0005_auto_20210416_0841'),
+    ]
+
+    operations = [
+    ]
diff --git a/sigi/apps/eventos/migrations/0016_merge.py b/sigi/apps/eventos/migrations/0016_merge.py
new file mode 100644
index 0000000..9c4907c
--- /dev/null
+++ b/sigi/apps/eventos/migrations/0016_merge.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('eventos', '0004_auto_20160719_0920'),
+        ('eventos', '0015_anexo'),
+    ]
+
+    operations = [
+    ]