Fix migrations after rebase

core/migrations/0007_auto_20161108_1703.py

@@ -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),
-        ),
-    ]

core/migrations/0008_sithfile_asked_for_removal.py

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

sas/migrations/0001_initial.py

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