Browse Source

fixing conflicts with the migration

pull/2260/head
Mariana Mendes 7 years ago
parent
commit
e9da5c8e96
  1. 4
      sapl/sessao/migrations/0028_auto_20181024_0848.py

4
sapl/sessao/migrations/0027_auto_20181023_1126.py → sapl/sessao/migrations/0028_auto_20181024_0848.py

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.13 on 2018-10-23 13:26
# Generated by Django 1.10.8 on 2018-10-24 10:48
from __future__ import unicode_literals
from django.db import migrations, models
@ -11,7 +11,7 @@ class Migration(migrations.Migration):
dependencies = [
('parlamentares', '0025_auto_20180924_1724'),
('sessao', '0026_auto_20181016_1944'),
('sessao', '0027_auto_20181023_1239'),
]
operations = [
Loading…
Cancel
Save