From dc80ab008bb1730c142b7141e79c12ee2faf5098 Mon Sep 17 00:00:00 2001
From: Cesar Carvalho <cesaraugc@gmail.com>
Date: Mon, 8 Jul 2019 11:20:13 -0300
Subject: [PATCH] Fix migrations na master

---
 .../norma/migrations/0026_merge_20190708_1120.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 sapl/norma/migrations/0026_merge_20190708_1120.py

diff --git a/sapl/norma/migrations/0026_merge_20190708_1120.py b/sapl/norma/migrations/0026_merge_20190708_1120.py
new file mode 100644
index 000000000..d1776b98c
--- /dev/null
+++ b/sapl/norma/migrations/0026_merge_20190708_1120.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-07-08 14:20
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('norma', '0025_auto_20190704_0816'),
+        ('norma', '0025_auto_20190704_1403'),
+    ]
+
+    operations = [
+    ]