[Lunar-commits] <moonbase> emerald: added emerald-git to CONFLICTS

[Duncan Gibson]

commit 7698835472bcc4ce065a96e703f1f54fe3e2f208
Author: Duncan Gibson <engelsman at lunar-linux.org>
Date:   Sun Jul 31 18:55:58 2011 +0200

    emerald: added emerald-git to CONFLICTS
---
 zbeta/compiz/emerald/CONFLICTS |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/zbeta/compiz/emerald/CONFLICTS b/zbeta/compiz/emerald/CONFLICTS
new file mode 100644
index 0000000..92ecf83
--- /dev/null
+++ b/zbeta/compiz/emerald/CONFLICTS
@@ -0,0 +1 @@
+conflicts emerald-git