From 6d5978682701fafc59c96780ddf1f20bcb0ed18c Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Wed, 7 Jun 2017 23:33:21 +0200
Subject: [PATCH] Remove migration to prevent conflicts
---
.../migrations/0045_auto_20170607_2324.py | 20 -------------------
1 file changed, 20 deletions(-)
delete mode 100644 submissions/migrations/0045_auto_20170607_2324.py
diff --git a/submissions/migrations/0045_auto_20170607_2324.py b/submissions/migrations/0045_auto_20170607_2324.py
deleted file mode 100644
index 019a80484..000000000
--- a/submissions/migrations/0045_auto_20170607_2324.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.3 on 2017-06-07 21:24
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('submissions', '0044_auto_20170602_1836'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='report',
- name='status',
- field=models.CharField(choices=[('draft', 'Draft'), ('vetted', 'Vetted'), ('unvetted', 'Unvetted'), ('incorrect', 'Rejected (incorrect)'), ('unclear', 'Rejected (unclear)'), ('notuseful', 'Rejected (not useful)'), ('notacademic', 'Rejected (not academic in style)')], default='unvetted', max_length=16),
- ),
- ]
--
GitLab