[gnome-continuous-yocto/gnomeostree-3.28-rocko: 921/8267] bitbake: toaster: Remove mismerged files

[Emmanuele Bassi <ebassi src gnome org>]

commit 27fa181897b54ee5a6151faf836df90a60163292
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Mon Jun 13 22:03:54 2016 +0100

    bitbake: toaster: Remove mismerged files
    
    Another patch added migrations in the correct location (different date) so
    these in the wrong directory can be removed.
    
    (Bitbake rev: 8aa84abc952835792db1614b6fe2305ab9dca9e1)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../migrations/0004_auto_20160509_0946.py          |   34 --------
 .../orm/migrations/0007_auto_20160509_0946.py      |   89 --------------------
 2 files changed, 0 insertions(+), 123 deletions(-)