summaryrefslogtreecommitdiffstats
path: root/compiz-fusion/compiz-profile/CONFLICTS
blob: d3341f775d62e5be17443acee525d1d96ac60ac2 (plain) (blame) 
1
2

conflicts  compiz-fusion          y
conflicts  compiz-fusion-profile  y
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-16 20:38:38 +0000