bitbake: toaster: Remove mismerged files

Another patch added migrations in the correct location (different date) so
these in the wrong directory can be removed.

(Bitbake rev: 8aa84abc952835792db1614b6fe2305ab9dca9e1)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 0 insertions, 34 deletions

diff --git a/bitbake/bitbake/lib/toaster/bldcontrol/migrations/0004_auto_20160509_0946.py b/bitbake/bitbake/lib/toaster/bldcontrol/migrations/0004_auto_20160509_0946.py
deleted file mode 100644
index 4a70e2d8e8..0000000000
--- a/bitbake/bitbake/lib/toaster/bldcontrol/migrations/0004_auto_20160509_0946.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('bldcontrol', '0003_add_cancelling_state'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='buildenvironment',
-            name='bbstate',
-            field=models.IntegerField(choices=[(0, 'stopped'), (1, 'started')], default=0),
-        ),
-        migrations.AlterField(
-            model_name='buildenvironment',
-            name='betype',
-            field=models.IntegerField(choices=[(0, 'local')]),
-        ),
-        migrations.AlterField(
-            model_name='buildenvironment',
-            name='lock',
-            field=models.IntegerField(choices=[(0, 'free'), (1, 'lock'), (2, 'running')], default=0),
-        ),
-        migrations.AlterField(
-            model_name='buildrequest',
-            name='state',
-            field=models.IntegerField(choices=[(0, 'created'), (1, 'queued'), (2, 'in progress'), (3, 'completed'), (4, 'failed'), (5, 'deleted'), (6, 'cancelling'), (7, 'archive')], default=0),
-        ),
-    ]