[Lunar-commits] r23963 - in moonbase/trunk: news/pan2 zbeta/pan-cvs zbeta/pan2-beta

[Terry Chan]

Author: tchan
Date: 2007-04-08 03:15:24 +0200 (Sun, 08 Apr 2007)
New Revision: 23963

Modified:
   moonbase/trunk/news/pan2/CONFLICTS
   moonbase/trunk/zbeta/pan-cvs/CONFLICTS
   moonbase/trunk/zbeta/pan2-beta/CONFLICTS
Log:
Fixed the CONFLICTS files since pan has been removed from moonbase. ONly pan2,
pan2-beta and pan-cvs are currently in moonbase.


Modified: moonbase/trunk/news/pan2/CONFLICTS
===================================================================
--- moonbase/trunk/news/pan2/CONFLICTS	2007-04-07 22:05:03 UTC (rev 23962)
+++ moonbase/trunk/news/pan2/CONFLICTS	2007-04-08 01:15:24 UTC (rev 23963)
@@ -1,3 +1,2 @@
-conflicts pan &&
 conflicts pan2-beta &&
 conflicts pan-cvs

Modified: moonbase/trunk/zbeta/pan-cvs/CONFLICTS
===================================================================
--- moonbase/trunk/zbeta/pan-cvs/CONFLICTS	2007-04-07 22:05:03 UTC (rev 23962)
+++ moonbase/trunk/zbeta/pan-cvs/CONFLICTS	2007-04-08 01:15:24 UTC (rev 23963)
@@ -1,3 +1,2 @@
-conflicts  pan  &&
 conflicts  pan2 &&
 conflicts  pan2-beta

Modified: moonbase/trunk/zbeta/pan2-beta/CONFLICTS
===================================================================
--- moonbase/trunk/zbeta/pan2-beta/CONFLICTS	2007-04-07 22:05:03 UTC (rev 23962)
+++ moonbase/trunk/zbeta/pan2-beta/CONFLICTS	2007-04-08 01:15:24 UTC (rev 23963)
@@ -1,3 +1,2 @@
-conflicts pan &&
 conflicts pan2 &&
 conflicts pan-cvs