summaryrefslogblamecommitdiffstats
path: root/qt6/qt6declarative/CONFLICTS
blob: 39946e320e2990986326d69a8beba179e71a4a41 (plain) (tree) 
26f2fc489b

1

                             
conflicts qt6quickcontrols2 y
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 14:34:44 +0000