You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2011/12/05 19:33:38 UTC

svn commit: r1210564 - /incubator/lcf/trunk/CHANGES.txt

Author: kwright
Date: Mon Dec  5 18:33:38 2011
New Revision: 1210564

URL: http://svn.apache.org/viewvc?rev=1210564&view=rev
Log:
Get rid of merge artifact

Modified:
    incubator/lcf/trunk/CHANGES.txt

Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1210564&r1=1210563&r2=1210564&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Mon Dec  5 18:33:38 2011
@@ -9,7 +9,6 @@ CONNECTORS-302: Add a specific Server ta
 CONNECTORS-303: Maven build doesn't consider HTML and JS files for the connector
 (Piergiorgio Lucidi)
 
-<<<<<<< .working
 CONNECTORS-284: HSQLDB runs out of memory on an extended load
 test, and had other problems too.  A new version of the db software was
 needed to correct this issue.  Thanks to the HSQLDB team for their