summaryrefslogtreecommitdiffstats
path: root/compiz-fusion/compiz-profile/CONFLICTS
diff options
context:
space:
mode:
Diffstat (limited to 'compiz-fusion/compiz-profile/CONFLICTS')
-rwxr-xr-xcompiz-fusion/compiz-profile/CONFLICTS2
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