summaryrefslogtreecommitdiffstats
path: root/gnome1-libs/nautilus/CONFLICTS
blob: 73ae7c21b2d23af52276bf7f6fe541d05da1aad1 (plain) (blame) 
1

conflicts nautilus2
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 18:40:31 +0000