[oe-commits] [bitbake] 44/44: toaster: Move files to correct location (mishandled merge)

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository bitbake.

commit ab453ef114abc8b83b577b22701abbbe898b7c8f
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Mon Jun 13 22:03:54 2016 +0100

    toaster: Move files to correct location (mishandled merge)
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 .../lib => lib}/toaster/bldcontrol/migrations/0004_auto_20160509_0946.py  | 0
 {bitbake/lib => lib}/toaster/orm/migrations/0007_auto_20160509_0946.py    | 0
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/bitbake/lib/toaster/bldcontrol/migrations/0004_auto_20160509_0946.py b/lib/toaster/bldcontrol/migrations/0004_auto_20160509_0946.py
similarity index 100%
rename from bitbake/lib/toaster/bldcontrol/migrations/0004_auto_20160509_0946.py
rename to lib/toaster/bldcontrol/migrations/0004_auto_20160509_0946.py
diff --git a/bitbake/lib/toaster/orm/migrations/0007_auto_20160509_0946.py b/lib/toaster/orm/migrations/0007_auto_20160509_0946.py
similarity index 100%
rename from bitbake/lib/toaster/orm/migrations/0007_auto_20160509_0946.py
rename to lib/toaster/orm/migrations/0007_auto_20160509_0946.py

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.