From df58f5b70bc725b94ffb49375cd63078015b6b17 Mon Sep 17 00:00:00 2001 From: Elliot Smith Date: Mon, 18 Jan 2016 10:28:39 +0000 Subject: [PATCH] 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 Signed-off-by: brian avery Signed-off-by: Richard Purdie --- bitbake/lib/toaster/orm/migrations/0004_merge.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 bitbake/lib/toaster/orm/migrations/0004_merge.py diff --git a/bitbake/lib/toaster/orm/migrations/0004_merge.py b/bitbake/lib/toaster/orm/migrations/0004_merge.py new file mode 100644 index 0000000000..5b9d122c4c --- /dev/null +++ b/bitbake/lib/toaster/orm/migrations/0004_merge.py @@ -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 = [ + ]