summaryrefslogtreecommitdiffstats
path: root/qt5-qmake/qupzilla/CONFLICTS
blob: 53b1b97c96eb776625b2bf9807802567c4a23175 (plain) (blame) 
1

conflicts qupzilla y
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 03:11:27 +0000