Resolve conflitos de migração

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 = [
+    ]

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 = [
+    ]