summaryrefslogtreecommitdiffstats
path: root/compiz-fusion/compiz-fusion-profile/CONFLICTS
diff options
context:
space:
mode:
Diffstat (limited to 'compiz-fusion/compiz-fusion-profile/CONFLICTS')
-rwxr-xr-xcompiz-fusion/compiz-fusion-profile/CONFLICTS1
1 files changed, 0 insertions, 1 deletions
diff --git a/compiz-fusion/compiz-fusion-profile/CONFLICTS b/compiz-fusion/compiz-fusion-profile/CONFLICTS
deleted file mode 100755
index 2a06bdf046..0000000000
--- a/compiz-fusion/compiz-fusion-profile/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts compiz-fusion y