[Lunar-commits] <moonbase> mesa-lib: remove the conflict with NVIDIA.

[Florin Braescu]

commit fcdb12b7a974350323de88a6bc842693289c998f
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Wed Sep 17 00:00:19 2008 +0300

    mesa-lib: remove the conflict with NVIDIA.
---
 xorg7/mesa-lib/CONFLICTS |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/xorg7/mesa-lib/CONFLICTS b/xorg7/mesa-lib/CONFLICTS
index 1e48749..92b4411 100644
--- a/xorg7/mesa-lib/CONFLICTS
+++ b/xorg7/mesa-lib/CONFLICTS
@@ -1,6 +1,5 @@
 conflicts XOrg6       &&
 conflicts XOrg-test   &&
-conflicts NVIDIA      &&
 conflicts NVIDIA-old  &&
 conflicts mesa-glu    &&
 conflicts glut        &&