Index: openacs-4/packages/acs-templating/tcl/test/parse-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/test/parse-test-procs.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-templating/tcl/test/parse-test-procs.tcl	4 Jun 2006 00:45:48 -0000	1.5
+++ openacs-4/packages/acs-templating/tcl/test/parse-test-procs.tcl	9 Jun 2006 00:14:00 -0000	1.6
@@ -123,4 +123,4 @@
     aa_log $errmsg
     aa_equals "square brackets in array key safe" $expanded_message "Test message \$two(\$three(\[__does_not_exist\]))"
    
-}>>>>>>> 1.2.2.4
+}