[Lunar-commits] <moonbase> pan2-beta: Updated for conflict with pan2-git

[Terry Chan]

commit b57edf089d485bf2435a62ab1934117920b27b86
Author: Terry Chan <tchan at lunar-linux.org>
Date:   Tue Aug 18 20:56:46 2009 -0500

    pan2-beta: Updated for conflict with pan2-git
---
 zbeta/pan2-beta/CONFLICTS |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/zbeta/pan2-beta/CONFLICTS b/zbeta/pan2-beta/CONFLICTS
index ef1a498..f9ce152 100644
--- a/zbeta/pan2-beta/CONFLICTS
+++ b/zbeta/pan2-beta/CONFLICTS
@@ -1 +1,2 @@
 conflicts pan2
+conflicts pan2-git