From 26c4adf682c7d9e6b65f5f41907298b3c4d89dd6 Mon Sep 17 00:00:00 2001
From: ricardocanela <ricardolimacanela@gmail.com>
Date: Wed, 30 Oct 2019 12:32:42 -0300
Subject: [PATCH] merging migrations

---
 sapl/base/migrations/0040_merge_20191030_1232.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 sapl/base/migrations/0040_merge_20191030_1232.py

diff --git a/sapl/base/migrations/0040_merge_20191030_1232.py b/sapl/base/migrations/0040_merge_20191030_1232.py
new file mode 100644
index 000000000..e1bcde669
--- /dev/null
+++ b/sapl/base/migrations/0040_merge_20191030_1232.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.25 on 2019-10-30 15:32
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0039_auto_20190913_1228'),
+        ('base', '0038_auditlog'),
+    ]
+
+    operations = [
+    ]