summaryrefslogtreecommitdiffstats
path: root/compiz-fusion/compiz-profile/CONFLICTS
blob: f5a8fe8b22ab353336e594965f391c6399602337 (plain) (blame)
1
conflicts  compiz-fusion-profile  y