[gnome-software: 2/2] Merge branch '1336-change-how-categories-are-merged' into 'main'

[Philip Withnall <pwithnall src gnome org>]

commit 461503089e1ee7741fde7a8b38cf06fcfe74b489
Merge: 1bc60eab7 22f91cdeb
Author: Philip Withnall <philip tecnocode co uk>
Date:   Wed Aug 11 10:04:37 2021 +0000

    Merge branch '1336-change-how-categories-are-merged' into 'main'
    
    Resolve "Change how categories are merged"
    
    Closes #1336
    
    See merge request GNOME/gnome-software!885

 lib/gs-desktop-data.c        | 37 +++++++++++++++++++------------------
 plugins/dummy/gs-self-test.c |  2 +-
 2 files changed, 20 insertions(+), 19 deletions(-)
---