From 8cfa6df6e2d07b8ec1cbb3d00557fb01e2980a6e Mon Sep 17 00:00:00 2001
From: Cesar Carvalho <cesaraugc@gmail.com>
Date: Fri, 26 Apr 2019 08:29:43 -0300
Subject: [PATCH] corrige migrations

---
 .../migrations/0048_merge_20190426_0828.py    | 16 +++++++++++
 .../migrations/0019_auto_20190426_0833.py     | 28 +++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 sapl/materia/migrations/0048_merge_20190426_0828.py
 create mode 100644 sapl/protocoloadm/migrations/0019_auto_20190426_0833.py

diff --git a/sapl/materia/migrations/0048_merge_20190426_0828.py b/sapl/materia/migrations/0048_merge_20190426_0828.py
new file mode 100644
index 000000000..94d624b1d
--- /dev/null
+++ b/sapl/materia/migrations/0048_merge_20190426_0828.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-04-26 11:28
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('materia', '0046_auto_20190417_1212'),
+        ('materia', '0047_auto_20190417_1432'),
+    ]
+
+    operations = [
+    ]
diff --git a/sapl/protocoloadm/migrations/0019_auto_20190426_0833.py b/sapl/protocoloadm/migrations/0019_auto_20190426_0833.py
new file mode 100644
index 000000000..edfdd8904
--- /dev/null
+++ b/sapl/protocoloadm/migrations/0019_auto_20190426_0833.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-04-26 11:33
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('protocoloadm', '0018_auto_20190314_1532'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='tramitacaoadministrativo',
+            name='ip',
+            field=models.CharField(blank=True, default='', max_length=30, verbose_name='IP'),
+        ),
+        migrations.AddField(
+            model_name='tramitacaoadministrativo',
+            name='user',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL, verbose_name='Usuário'),
+        ),
+    ]