[Lunar-commits] <moonbase> pixman: Removed two incorrect lines from the CONFLICTS file.

[Terry Chan]

commit a8c1298830e61b1414fa0a9d07f864bfd322eb31
Author: Terry Chan <tchan at lunar-linux.org>
Date:   Sun Jun 22 23:35:43 2008 -0500

    pixman: Removed two incorrect lines from the CONFLICTS file.
    XOrg-fonts-base and XOrg-fonts-extra do NOT conflict with pixman. Both of these
    modules merely install fonts. There is NO conflict.
---
 xorg7/lib/pixman/CONFLICTS |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/xorg7/lib/pixman/CONFLICTS b/xorg7/lib/pixman/CONFLICTS
index fa885b1..dd68bc9 100644
--- a/xorg7/lib/pixman/CONFLICTS
+++ b/xorg7/lib/pixman/CONFLICTS
@@ -1,6 +1,4 @@
 conflicts XOrg6
 conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
 conflicts XOrg-drm
 conflicts XOrg-drm-cvs