[Lunar-commits] <moonbase> conflict xpm <-> libXpm

[Samuel Verstraete]

commit 238f8506211006cb9a8d6ecdc28de0b19047f42d
Author: Samuel Verstraete <elangelo at lunar-linux.org>
Date:   Sun Mar 2 13:19:27 2008 +0100

    conflict xpm <-> libXpm
---
 xorg7/lib/libXpm/CONFLICTS |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/xorg7/lib/libXpm/CONFLICTS b/xorg7/lib/libXpm/CONFLICTS
index 5013182..6b7132b 100644
--- a/xorg7/lib/libXpm/CONFLICTS
+++ b/xorg7/lib/libXpm/CONFLICTS
@@ -3,4 +3,5 @@ conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&
 conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
+conflicts XOrg-drm-cvs &&
+conflicts xpm