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>

bitbake/bitbake/lib/toaster/bldcontrol/migrations/0004_auto_20160509_0946.py

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

bitbake/bitbake/lib/toaster/orm/migrations/0007_auto_20160509_0946.py

@@ -1,89 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('orm', '0006_add_cancelled_state'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='build',
-            name='outcome',
-            field=models.IntegerField(choices=[(0, 'Succeeded'), (1, 'Failed'), (2, 'In Progress'), (3, 'Cancelled')], default=2),
-        ),
-        migrations.AlterField(
-            model_name='helptext',
-            name='area',
-            field=models.IntegerField(choices=[(0, 'variable')]),
-        ),
-        migrations.AlterField(
-            model_name='layer',
-            name='summary',
-            field=models.TextField(null=True, help_text='One-line description of the layer', default=None),
-        ),
-        migrations.AlterField(
-            model_name='layer_version',
-            name='local_path',
-            field=models.FilePathField(max_length=1024, default='/'),
-        ),
-        migrations.AlterField(
-            model_name='layersource',
-            name='sourcetype',
-            field=models.IntegerField(choices=[(0, 'local'), (1, 'layerindex'), (2, 'imported')]),
-        ),
-        migrations.AlterField(
-            model_name='logmessage',
-            name='level',
-            field=models.IntegerField(choices=[(0, 'info'), (1, 'warn'), (2, 'error'), (3, 'critical'), (-1, 'toaster exception')], default=0),
-        ),
-        migrations.AlterField(
-            model_name='package',
-            name='installed_name',
-            field=models.CharField(max_length=100, default=''),
-        ),
-        migrations.AlterField(
-            model_name='package_dependency',
-            name='dep_type',
-            field=models.IntegerField(choices=[(0, 'depends'), (1, 'depends'), (3, 'recommends'), (2, 'recommends'), (4, 'suggests'), (5, 'provides'), (6, 'replaces'), (7, 'conflicts')]),
-        ),
-        migrations.AlterField(
-            model_name='recipe_dependency',
-            name='dep_type',
-            field=models.IntegerField(choices=[(0, 'depends'), (1, 'rdepends')]),
-        ),
-        migrations.AlterField(
-            model_name='release',
-            name='branch_name',
-            field=models.CharField(max_length=50, default=''),
-        ),
-        migrations.AlterField(
-            model_name='releasedefaultlayer',
-            name='layer_name',
-            field=models.CharField(max_length=100, default=''),
-        ),
-        migrations.AlterField(
-            model_name='target_file',
-            name='inodetype',
-            field=models.IntegerField(choices=[(1, 'regular'), (2, 'directory'), (3, 'symlink'), (4, 'socket'), (5, 'fifo'), (6, 'character'), (7, 'block')]),
-        ),
-        migrations.AlterField(
-            model_name='task',
-            name='outcome',
-            field=models.IntegerField(choices=[(-1, 'Not Available'), (0, 'Succeeded'), (1, 'Covered'), (2, 'Cached'), (3, 'Prebuilt'), (4, 'Failed'), (5, 'Empty')], default=-1),
-        ),
-        migrations.AlterField(
-            model_name='task',
-            name='script_type',
-            field=models.IntegerField(choices=[(0, 'N/A'), (2, 'Python'), (3, 'Shell')], default=0),
-        ),
-        migrations.AlterField(
-            model_name='task',
-            name='sstate_result',
-            field=models.IntegerField(choices=[(0, 'Not Applicable'), (1, 'File not in cache'), (2, 'Failed'), (3, 'Succeeded')], default=0),
-        ),
-    ]