jmitchell 2004/06/17 05:00:46 Modified: contrib/struts-faces README.txt Log: Fixed another typo Revision Changes Path 1.11 +6 -2 jakarta-struts/contrib/struts-faces/README.txt Index: README.txt =================================================================== RCS file: /home/cvs/jakarta-struts/contrib/struts-faces/README.txt,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- README.txt 16 Jun 2004 23:24:27 -0000 1.10 +++ README.txt 17 Jun 2004 12:00:46 -0000 1.11 @@ -39,7 +39,11 @@ * It is now possible to mix pure JavaServer Faces pages, and those using the struts-faces integration library, in the same webapp. Previously, - it was required to use only Stuts-based handlers for form submits. +<<<<<<< README.txt + it was required to use only Struts-based handlers for form submts. +======= + it was required to use only Struts-based handlers for form submits. +>>>>>>> 1.10 * All attributes of the component tags in the Struts-Faces integration library have been "value binding enabled", meaning you can use value binding
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]