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 /scripts/lib/wic/plugins/source/bootimg-pcbios.py | |
| 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 'scripts/lib/wic/plugins/source/bootimg-pcbios.py')
0 files changed, 0 insertions, 0 deletions