jmitchell 2004/06/17 05:04:26
Modified: contrib/struts-faces README.txt
Log:
This is why I prefer gui tools over command line sometimes;)
Revision Changes Path
1.12 +1 -5 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- README.txt 17 Jun 2004 12:00:46 -0000 1.11
+++ README.txt 17 Jun 2004 12:04:26 -0000 1.12
@@ -39,11 +39,7 @@
* It is now possible to mix pure JavaServer Faces pages, and those
using the struts-faces integration library, in the same webapp. Previously,
-<<<<<<< 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]
