Fix migrations after rebase

This commit is contained in:
Skia 2016-11-23 11:55:10 +01:00
parent b8c9aa4e7f
commit 0b23d39e15
3 changed files with 2 additions and 25 deletions

View File

@ -1,23 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('core', '0006_merge'),
]
operations = [
migrations.RemoveField(
model_name='sithfile',
name='is_authorized',
),
migrations.AddField(
model_name='sithfile',
name='is_moderated',
field=models.BooleanField(verbose_name='is moderated', default=False),
),
]

View File

@ -7,7 +7,7 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('core', '0007_auto_20161108_1703'), ('core', '0006_auto_20161108_1703'),
] ]
operations = [ operations = [

View File

@ -7,7 +7,7 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('core', '0007_auto_20161108_1703'), ('core', '0006_auto_20161108_1703'),
] ]
operations = [ operations = [