[Lunar-commits] r26162 - in moonbase/trunk: chat/weechat zbeta/weechat-cvs

[Terry Chan]

Author: tchan
Date: 2007-10-11 16:44:17 +0200 (Thu, 11 Oct 2007)
New Revision: 26162

Modified:
   moonbase/trunk/chat/weechat/CONFLICTS
   moonbase/trunk/zbeta/weechat-cvs/CONFLICTS
Log:
Updated these CONFLICTS files for weechat-git changes.


Modified: moonbase/trunk/chat/weechat/CONFLICTS
===================================================================
--- moonbase/trunk/chat/weechat/CONFLICTS	2007-10-11 14:44:10 UTC (rev 26161)
+++ moonbase/trunk/chat/weechat/CONFLICTS	2007-10-11 14:44:17 UTC (rev 26162)
@@ -1 +1,2 @@
 conflicts weechat-cvs
+conflicts weechat-git

Modified: moonbase/trunk/zbeta/weechat-cvs/CONFLICTS
===================================================================
--- moonbase/trunk/zbeta/weechat-cvs/CONFLICTS	2007-10-11 14:44:10 UTC (rev 26161)
+++ moonbase/trunk/zbeta/weechat-cvs/CONFLICTS	2007-10-11 14:44:17 UTC (rev 26162)
@@ -1 +1,2 @@
 conflicts weechat
+conflicts weechat-git