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

[Terry Chan]

commit 16928bfdfa37d80234dab38cbeaef19e1835112c
Author: Terry Chan <tchan at lunar-linux.org>
Date:   Tue Aug 18 20:57:07 2009 -0500

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

diff --git a/news/pan2/CONFLICTS b/news/pan2/CONFLICTS
index 32c9cef..cc6075a 100644
--- a/news/pan2/CONFLICTS
+++ b/news/pan2/CONFLICTS
@@ -1 +1,2 @@
 conflicts pan2-beta
+conflicts pan2-git