[Lunar-commits] <moonbase> clean up flash conflicts

[Zbigniew Luszpinski]

commit e23ff703add52729cfd24c1e2ee1ba1fb9ab48af
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Wed Oct 5 04:40:35 2011 +0200

    clean up flash conflicts
---
 web/flash-plugin-11/CONFLICTS |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/web/flash-plugin-11/CONFLICTS b/web/flash-plugin-11/CONFLICTS
deleted file mode 100644
index 5088d15..0000000
--- a/web/flash-plugin-11/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts flash-plugin-10