entrouvert
/
authentic
16
0
Fork 0
Code Issues Pull Requests 33 Releases Activity

solve migration conflit (#31214)

This commit is contained in:
Paul Marillonnet 2019-03-08 11:23:25 +01:00
parent 595d05ad7a
commit 3f02579dc3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/authentic2/a2_rbac/migrations/0018_organizationalunit_show_username.py → src/authentic2/a2_rbac/migrations/0019_organizationalunit_show_username.py
View File

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.18 on 2019-03-06 10:21
# Generated by Django 1.11.18 on 2019-03-08 10:22
from __future__ import unicode_literals
from django.db import migrations, models
@ -8,7 +8,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('a2_rbac', '0017_organizationalunit_user_can_reset_password'),
('a2_rbac', '0018_organizationalunit_user_add_password_policy'),
]
operations = [