[TWiki-Dev] [SVN] CrawfordCurrie r11154 - twiki/branches/DEVELOP/tools

[<de...@de...>]

Author: CrawfordCurrie
Date: 2006-07-24 06:36:07 -0500 (Mon, 24 Jul 2006)
New Revision: 11154

Modified:
   twiki/branches/DEVELOP/tools/MANIFEST
Log:
Item2547: Item1611: Item1865: Item1872: Item1911: Item1984: Item2249: Item2285: Item2439: Item2497: Item2582: Item2595: accidentally included a merge mark

Modified: twiki/branches/DEVELOP/tools/MANIFEST
===================================================================
--- twiki/branches/DEVELOP/tools/MANIFEST	2006-07-24 11:24:07 UTC (rev 11153)
+++ twiki/branches/DEVELOP/tools/MANIFEST	2006-07-24 11:36:07 UTC (rev 11154)
@@ -915,4 +915,3 @@
 !include twikiplugins/TipsContrib/lib/TWiki/Contrib/TipsContrib
 !include twikiplugins/TwistyContrib/lib/TWiki/Contrib/TwistyContrib
 !include twikiplugins/WysiwygPlugin/lib/TWiki/Plugins/WysiwygPlugin
->>>>>>> .merge-right.r9276