Elliot Smith df58f5b70b 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>

2016-02-10 13:29:20 +00:00

..

bb

bitbake: toaster: buildinfohelper Add the concept of CustomImagePackage

2016-02-10 13:29:17 +00:00

bs4

bitbake: bs4: Add beautifulsoup 4.3.2 to assist the fetcher

2014-11-06 16:45:23 +00:00

ply

Add pysh, ply, and codegen to lib/ to prepare for future work

2010-08-03 14:06:07 +01:00

prserv

bitbake: bitbake: prserv: do not clear umask when daemonizing

2016-02-04 23:47:48 +00:00

toaster

bitbake: toaster: add merge migration to resolve conflict

2016-02-10 13:29:20 +00:00

codegen.py

Add pysh, ply, and codegen to lib/ to prepare for future work

2010-08-03 14:06:07 +01:00

progressbar.py

bitbake: progressbar: use '/usr/bin/env' in shebangs with python

2014-11-12 15:25:17 +00:00

pyinotify.py

bitbake: bitbake: Add pyinotify to lib/

2015-01-14 11:32:02 +00:00