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

..

bldcollector

bitbake: toaster: Prevent deprecation warnings for RedirectView

2015-12-14 23:13:07 +00:00

bldcontrol

bitbake: toaster: localhostbectrl Update the dirpath of customrecipe's base layer

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

contrib

bitbake: toaster: Update UI test runner

2016-01-25 16:29:10 +00:00

orm

bitbake: toaster: add merge migration to resolve conflict

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

toastergui

bitbake: toaster: project builds Poll the server to get latest progress for build

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

toastermain

bitbake: toastergui: fix error and warning counts for builds

2016-01-15 16:30:01 +00:00

__init__.py

bitbake: toaster: add toaster code to bitbake

2013-10-18 11:13:49 +01:00

manage.py

bitbake: toaster: add toaster code to bitbake

2013-10-18 11:13:49 +01:00