summaryrefslogblamecommitdiffstats
path: root/kde5-apps/kphotoalbum/CONFLICTS
blob: edcbd977f7f89948e48d3cb87f558e514dbc4748 (plain) (tree) 
7731f2ec4c

1

                        
conflicts kphotoalbum4 n
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 05:24:11 +0000