diff options
| author | Eric Sandall | 2009-04-16 23:50:23 -0700 |
|---|---|---|
| committer | Eric Sandall | 2009-04-17 00:37:49 -0700 |
| commit | 6252955d159999b44ae2658d99d6420fe520d720 (patch) | |
| tree | 0d7a14fadf362febd4281ad4ad862c61b2484e8b /compiz-fusion/compiz-profile/CONFLICTS | |
| parent | da8250e7f80e91466dabf3071a5ad140bc52c3f7 (diff) | |
compiz-fusion-profile: Renamed to compiz-profile
Diffstat (limited to 'compiz-fusion/compiz-profile/CONFLICTS')
| -rwxr-xr-x | compiz-fusion/compiz-profile/CONFLICTS | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/compiz-fusion/compiz-profile/CONFLICTS b/compiz-fusion/compiz-profile/CONFLICTS new file mode 100755 index 0000000000..d3341f775d --- /dev/null +++ b/compiz-fusion/compiz-profile/CONFLICTS @@ -0,0 +1,2 @@ +conflicts compiz-fusion y +conflicts compiz-fusion-profile y |