[Lunar-commits] r22822 - in moonbase/trunk/news: pan pan2

[Terry Chan]

Author: tchan
Date: 2007-01-03 18:25:44 +0100 (Wed, 03 Jan 2007)
New Revision: 22822

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


Modified: moonbase/trunk/news/pan/CONFLICTS
===================================================================
--- moonbase/trunk/news/pan/CONFLICTS	2007-01-03 08:05:07 UTC (rev 22821)
+++ moonbase/trunk/news/pan/CONFLICTS	2007-01-03 17:25:44 UTC (rev 22822)
@@ -1 +1,3 @@
-conflicts pan2
+conflicts pan2 &&
+conflicts pan2-beta &&
+conflicts pan-cvs

Modified: moonbase/trunk/news/pan2/CONFLICTS
===================================================================
--- moonbase/trunk/news/pan2/CONFLICTS	2007-01-03 08:05:07 UTC (rev 22821)
+++ moonbase/trunk/news/pan2/CONFLICTS	2007-01-03 17:25:44 UTC (rev 22822)
@@ -1 +1,3 @@
-conflicts pan
+conflicts pan &&
+conflicts pan2-beta &&
+conflicts pan-cvs