summaryrefslogtreecommitdiffstats
path: root/kde-frameworks/khtml/CONFLICTS
blob: d5bdb8d82fbbbbd1aafb7e514c758aa6a7cef2f5 (plain) (blame) 
1

conflicts khtml y
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 04:38:27 +0000