svn commit: r210083 - in /myfaces: forrest/trunk/content/xdocs/community/versioning.xml sandbox/trunk/src/java/org/apache/myfaces/custom/ajaxsuggest/AjaxInputSuggest.java

[mm...@apache.org]

Author: mmarinschek
Date: Mon Jul 11 01:11:04 2005
New Revision: 210083

URL: http://svn.apache.org/viewcvs?rev=210083&view=rev
Log:
solved conflict

Modified:
    myfaces/forrest/trunk/content/xdocs/community/versioning.xml
    myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/ajaxsuggest/AjaxInputSuggest.java

Modified: myfaces/forrest/trunk/content/xdocs/community/versioning.xml
URL: http://svn.apache.org/viewcvs/myfaces/forrest/trunk/content/xdocs/community/versioning.xml?rev=210083&r1=210082&r2=210083&view=diff
==============================================================================
--- myfaces/forrest/trunk/content/xdocs/community/versioning.xml (original)
+++ myfaces/forrest/trunk/content/xdocs/community/versioning.xml Mon Jul 11 01:11:04 2005
@@ -76,6 +76,7 @@
             </td>
         </tr>               
     </table>
+
     <p>
         <br/>
         The source code can also be viewed online <link href="http://svn.apache.org/viewcvs.cgi/myfaces/">here</link>.  

Modified: myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/ajaxsuggest/AjaxInputSuggest.java
URL: http://svn.apache.org/viewcvs/myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/ajaxsuggest/AjaxInputSuggest.java?rev=210083&r1=210082&r2=210083&view=diff
==============================================================================
--- myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/ajaxsuggest/AjaxInputSuggest.java (original)
+++ myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/ajaxsuggest/AjaxInputSuggest.java Mon Jul 11 01:11:04 2005
@@ -28,6 +28,7 @@
  *
  * @version $Revision: 169662 $ $Date: 2005-05-11 19:57:24 +0200 (Wed, 11 May 2005) $
  */
+
 public class AjaxInputSuggest extends HtmlInputText implements AjaxComponent
 {
     private MethodBinding _suggestedItemsMethod;