From 274f20835a71d5cd479b735040cf7db372b6bc35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Rodrigues?= Date: Wed, 27 Nov 2019 18:10:34 -0300 Subject: [PATCH] Fix migrations --- .../migrations/0065_merge_20191127_1804.py | 16 ++++++++++++++++ .../norma/migrations/0030_merge_20191127_1804.py | 16 ++++++++++++++++ .../migrations/0051_merge_20191127_1804.py | 16 ++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 sapl/materia/migrations/0065_merge_20191127_1804.py create mode 100644 sapl/norma/migrations/0030_merge_20191127_1804.py create mode 100644 sapl/sessao/migrations/0051_merge_20191127_1804.py diff --git a/sapl/materia/migrations/0065_merge_20191127_1804.py b/sapl/materia/migrations/0065_merge_20191127_1804.py new file mode 100644 index 000000000..8779c6329 --- /dev/null +++ b/sapl/materia/migrations/0065_merge_20191127_1804.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.20 on 2019-11-27 21:04 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('materia', '0061_auto_20191120_1440'), + ('materia', '0064_merge_20191121_1346'), + ] + + operations = [ + ] diff --git a/sapl/norma/migrations/0030_merge_20191127_1804.py b/sapl/norma/migrations/0030_merge_20191127_1804.py new file mode 100644 index 000000000..6ba1c73c6 --- /dev/null +++ b/sapl/norma/migrations/0030_merge_20191127_1804.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.20 on 2019-11-27 21:04 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('norma', '0029_auto_20191024_1344'), + ('norma', '0028_merge_20191003_0909'), + ] + + operations = [ + ] diff --git a/sapl/sessao/migrations/0051_merge_20191127_1804.py b/sapl/sessao/migrations/0051_merge_20191127_1804.py new file mode 100644 index 000000000..f11319fe2 --- /dev/null +++ b/sapl/sessao/migrations/0051_merge_20191127_1804.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.20 on 2019-11-27 21:04 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('sessao', '0048_auto_20190829_1253'), + ('sessao', '0050_auto_20191029_1441'), + ] + + operations = [ + ]