summaryrefslogtreecommitdiffstats
path: root/gnome1-libs/gnome-db/CONFLICTS
blob: 598964752a196fc275956c598ebce7e28c88d661 (plain) (blame) 
1

conflicts mergeant
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 15:21:36 +0000