diff options
author | Elliot Smith <elliot.smith@intel.com> | 2016-01-18 10:28:39 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-10 13:29:20 +0000 |
commit | df58f5b70bc725b94ffb49375cd63078015b6b17 (patch) | |
tree | 48b43f84562a1c4ee303e24911d35ee97131ba48 /bitbake/lib/toaster/orm/migrations | |
parent | 38f49132706d260498ed221c51d3aeef36dde0e9 (diff) | |
download | poky-df58f5b70bc725b94ffb49375cd63078015b6b17.tar.gz |
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>
Diffstat (limited to 'bitbake/lib/toaster/orm/migrations')
-rw-r--r-- | bitbake/lib/toaster/orm/migrations/0004_merge.py | 15 |
1 files changed, 15 insertions, 0 deletions
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 @@ | |||
1 | # -*- coding: utf-8 -*- | ||
2 | from __future__ import unicode_literals | ||
3 | |||
4 | from django.db import migrations, models | ||
5 | |||
6 | |||
7 | class Migration(migrations.Migration): | ||
8 | |||
9 | dependencies = [ | ||
10 | ('orm', '0002_auto_20151223_1528'), | ||
11 | ('orm', '0003_customimagepackage'), | ||
12 | ] | ||
13 | |||
14 | operations = [ | ||
15 | ] | ||