matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove and re-add conflicting migrations.

Browse Source 
Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2018-04-01 23:42:37 -04:00
parent cd267d0f1a
commit c3f00069c9
4 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mayan/apps/acls/migrations/0002_auto_20180310_1715.py → mayan/apps/acls/migrations/0003_auto_20180402_0339.py
View File

@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.10 on 2018-03-10 17:15
# Generated by Django 1.11.11 on 2018-04-02 03:39
from __future__ import unicode_literals
from django.db import migrations
@@ -8,7 +8,7 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('acls', '0001_squashed_0002_auto_20150703_0513'),
('acls', '0002_auto_20150703_0513'),
]
operations = [

20
mayan/apps/common/migrations/0009_auto_20180402_0339.py Normal file
View File

File diff suppressed because one or more lines are too long

4
mayan/apps/linking/migrations/0002_auto_20180313_1926.py → mayan/apps/linking/migrations/0006_auto_20180402_0339.py
View File

@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.10 on 2018-03-13 19:26
# Generated by Django 1.11.11 on 2018-04-02 03:39
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 = [
('linking', '0001_initial_squashed_0005_auto_20150729_2344'),
('linking', '0005_auto_20150729_2344'),
]
operations = [

4
mayan/apps/metadata/migrations/0002_auto_20180315_0029.py → mayan/apps/metadata/migrations/0009_auto_20180402_0339.py
View File

@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.10 on 2018-03-15 00:29
# Generated by Django 1.11.11 on 2018-04-02 03:39
from __future__ import unicode_literals
from django.db import migrations
@@ -8,7 +8,7 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('metadata', '0001_initial_squashed_0008_auto_20180310_1715'),
('metadata', '0008_auto_20180310_1715'),
]
operations = [