summaryrefslogblamecommitdiffstats
path: root/kde5-utils/konsole/CONFLICTS
blob: ec70f7dc7d4d9f4cb67283e8921de594a411f9f8 (plain) (tree) 
330de1a15f

1

                    
conflicts konsole5 y
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 15:42:36 +0000