[Laszlo-checkins] r5805 - sandbox/ben/branches/cuppatea

[ben@openlaszlo.org]

Author: ben
Date: 2007-07-25 22:07:30 -0700 (Wed, 25 Jul 2007)
New Revision: 5805

Modified:
   sandbox/ben/branches/cuppatea/README.txt
Log:
more experimental changes to figure out bidirectional merging with svnmerge

Modified: sandbox/ben/branches/cuppatea/README.txt
===================================================================
--- sandbox/ben/branches/cuppatea/README.txt	2007-07-26 05:06:03 UTC (rev 5804)
+++ sandbox/ben/branches/cuppatea/README.txt	2007-07-26 05:07:30 UTC (rev 5805)
@@ -6,6 +6,8 @@
 And here is another lovely change by ben, made in the cuppatea branch.
 If all goes well, we'll see it back in the cuppajoe branch -- maybe. 
 
+Another lovely change made in cuppatea. Will this make it back to cuppajoe?
+
 Here's what you'll find:
 
     LICENSE.txt           - The End User License Agreement for the LPS.