[gnome-software: 2/2] Merge branch '1886-mutually-exclusive-states-in-flatpakref-conflict-and-produce-similar-errors' into

[Georges Basile Stavracas Neto <gbsneto src gnome org>]

commit 1248858285b6074dec2e3c7d010d68f1bfe32fbc
Merge: f6b24cee9 934559be5
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Thu Sep 1 14:11:57 2022 +0000

    Merge branch '1886-mutually-exclusive-states-in-flatpakref-conflict-and-produce-similar-errors' into 
'main'
    
    Resolve "Mutually exclusive states in Flatpakref conflict and produce similar errors"
    
    Closes #1886
    
    See merge request GNOME/gnome-software!1487

 plugins/flatpak/gs-flatpak.c | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)
---