bitbake: toaster: add merge migration to resolve conflict
Django detects a conflict between a migration added to support image customisation and another migration which supports PROVIDES. Add a merge migration to resolve the conflict (as suggested by Django). (Bitbake rev: a26bfd9d2490dc0fd90bf6d1690e63ac26001559) Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
38f4913270
commit
df58f5b70b
|
@ -0,0 +1,15 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('orm', '0002_auto_20151223_1528'),
|
||||
('orm', '0003_customimagepackage'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
]
|
Loading…
Reference in New Issue