[Lunar-commits] <moonbase> mplayerplug-in, xine-plugin: As Dennis noted those CONFLICTS are not needed.

[Moritz Heiber]

commit 109624f80003a6ea9435fa385adfe8ff5eddca82
Author: Moritz Heiber <moe at lunar-linux.org>
Date:   Sun Apr 27 16:26:56 2008 +0200

    mplayerplug-in, xine-plugin: As Dennis noted those CONFLICTS are not needed.
---
 video/mplayerplug-in/CONFLICTS |    1 -
 video/xine-plugin/CONFLICTS    |    1 -
 2 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/video/mplayerplug-in/CONFLICTS b/video/mplayerplug-in/CONFLICTS
deleted file mode 100644
index d53a7a3..0000000
--- a/video/mplayerplug-in/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts xine-plugin
diff --git a/video/xine-plugin/CONFLICTS b/video/xine-plugin/CONFLICTS
deleted file mode 100644
index 8916f58..0000000
--- a/video/xine-plugin/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts mplayerplug-in