From 55101749eb884a327b5e11100ea4e474baf3b18b Mon Sep 17 00:00:00 2001 From: Eric Sandall Date: Fri, 17 Apr 2009 00:06:12 -0700 Subject: compiz-profile: No longer conflicts with non-existent compiz-fusion spell --- compiz-fusion/compiz-profile/CONFLICTS | 1 - compiz-fusion/compiz-profile/HISTORY | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'compiz-fusion') 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 diff --git a/compiz-fusion/compiz-profile/HISTORY b/compiz-fusion/compiz-profile/HISTORY index 3c22b64fb3..d11e38a18d 100644 --- a/compiz-fusion/compiz-profile/HISTORY +++ b/compiz-fusion/compiz-profile/HISTORY @@ -1,5 +1,7 @@ 2009-04-16 Eric Sandall * Renamed from compiz-fusion-profile + * CONFLICTS: No longer conflicts with compiz-fusion spell, it + no longer exists 2008-10-04 Eric Sandall * DETAILS: Updated to 0.7.8 -- cgit v1.2.3