From 0b23d39e15cdfeaca255ebf05d762f489bb2d1bf Mon Sep 17 00:00:00 2001
From: Skia <skia@libskia.so>
Date: Wed, 23 Nov 2016 11:55:10 +0100
Subject: [PATCH] Fix migrations after rebase

---
 core/migrations/0007_auto_20161108_1703.py    | 23 -------------------
 .../0008_sithfile_asked_for_removal.py        |  2 +-
 sas/migrations/0001_initial.py                |  2 +-
 3 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 core/migrations/0007_auto_20161108_1703.py

diff --git a/core/migrations/0007_auto_20161108_1703.py b/core/migrations/0007_auto_20161108_1703.py
deleted file mode 100644
index 5e4f73b7..00000000
--- a/core/migrations/0007_auto_20161108_1703.py
+++ /dev/null
@@ -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),
-        ),
-    ]
diff --git a/core/migrations/0008_sithfile_asked_for_removal.py b/core/migrations/0008_sithfile_asked_for_removal.py
index a5fa30f7..79ae887b 100644
--- a/core/migrations/0008_sithfile_asked_for_removal.py
+++ b/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 = [
diff --git a/sas/migrations/0001_initial.py b/sas/migrations/0001_initial.py
index 3a437f48..573a7274 100644
--- a/sas/migrations/0001_initial.py
+++ b/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 = [