[Lunar-commits] r22823 - moonbase/trunk/zbeta/pan-cvs

[Terry Chan]

Author: tchan
Date: 2007-01-03 18:26:19 +0100 (Wed, 03 Jan 2007)
New Revision: 22823

Modified:
   moonbase/trunk/zbeta/pan-cvs/CONFLICTS
Log:
Updated CONFLICTS for pan2-beta.


Modified: moonbase/trunk/zbeta/pan-cvs/CONFLICTS
===================================================================
--- moonbase/trunk/zbeta/pan-cvs/CONFLICTS	2007-01-03 17:25:44 UTC (rev 22822)
+++ moonbase/trunk/zbeta/pan-cvs/CONFLICTS	2007-01-03 17:26:19 UTC (rev 22823)
@@ -1,2 +1,3 @@
 conflicts  pan  &&
-conflicts  pan2
+conflicts  pan2 &&
+conflicts  pan2-beta