diff options
Diffstat (limited to 'compiz-fusion/compiz-profile/CONFLICTS')
| -rwxr-xr-x | compiz-fusion/compiz-profile/CONFLICTS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/compiz-fusion/compiz-profile/CONFLICTS b/compiz-fusion/compiz-profile/CONFLICTS index d3341f775d..f5a8fe8b22 100755 --- a/compiz-fusion/compiz-profile/CONFLICTS +++ b/compiz-fusion/compiz-profile/CONFLICTS @@ -1,2 +1 @@ -conflicts compiz-fusion y conflicts compiz-fusion-profile y |