[gcr: 3/3] Merge branch 'nielsdg/conflicting-files' into 'master'

From: Niels De Graef <nielsdg src gnome org>
To: commits-list gnome org
Cc:
Subject: [gcr: 3/3] Merge branch 'nielsdg/conflicting-files' into 'master'
Date: Fri, 24 Jun 2022 14:38:44 +0000 (UTC)


commit 09d62e4af0a6827069ea74349ccf93b13e1848c7
Merge: dbfe1f54 2b393e14
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Fri Jun 24 14:38:36 2022 +0000

    Merge branch 'nielsdg/conflicting-files' into 'master'
    
    Fix some conflicts between gcr3 and gcr4
    
    Closes #99
    
    See merge request GNOME/gcr!96

 meson.build        | 2 +-
 schema/meson.build | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)
---

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]