[Lunar-commits] <moonbase> zsnes: remove the conflicts file.

[Florin Braescu]

commit b7060226b49a3ecbe44c710419dd334d18b308bc
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Sat Apr 25 19:32:50 2009 +0300

    zsnes: remove the conflicts file.
---
 zbeta/zsnes/CONFLICTS |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/zbeta/zsnes/CONFLICTS b/zbeta/zsnes/CONFLICTS
deleted file mode 100644
index 52fe1d1..0000000
--- a/zbeta/zsnes/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts zsnes-cvs