tapestry-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thiag...@apache.org
Subject tapestry-5 git commit: Fixing JavaDoc
Date Sun, 07 Dec 2014 03:00:10 GMT
Repository: tapestry-5
Updated Branches:
  refs/heads/beanmodel-split 31493159a -> b21ec4af5


Fixing JavaDoc


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/b21ec4af
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/b21ec4af
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/b21ec4af

Branch: refs/heads/beanmodel-split
Commit: b21ec4af530b99b2402bc4706d123bd2c170a83c
Parents: 3149315
Author: Thiago H. de Paula Figueiredo <thiagohp@apache.org>
Authored: Sun Dec 7 00:59:55 2014 -0200
Committer: Thiago H. de Paula Figueiredo <thiagohp@apache.org>
Committed: Sun Dec 7 00:59:55 2014 -0200

----------------------------------------------------------------------
 .../apache/tapestry5/beaneditor/BeanModelSourceBuilder.java   | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b21ec4af/beanmodel/src/main/java/org/apache/tapestry5/beaneditor/BeanModelSourceBuilder.java
----------------------------------------------------------------------
diff --git a/beanmodel/src/main/java/org/apache/tapestry5/beaneditor/BeanModelSourceBuilder.java
b/beanmodel/src/main/java/org/apache/tapestry5/beaneditor/BeanModelSourceBuilder.java
index 1b08733..68df475 100644
--- a/beanmodel/src/main/java/org/apache/tapestry5/beaneditor/BeanModelSourceBuilder.java
+++ b/beanmodel/src/main/java/org/apache/tapestry5/beaneditor/BeanModelSourceBuilder.java
@@ -40,17 +40,12 @@ import org.apache.tapestry5.services.PropertyConduitSource;
 import org.slf4j.LoggerFactory;
 
 /**
-<<<<<<< HEAD
  * <p>Utility class for creating {@link BeanModelSource} instances without
  * Tapestry-IoC. Usage of Tapestry-IoC is still recommended.
  * </p>
  * <p>The setter methods can be used to customize the BeanModelSource to be created
and can be 
- * (and usually are skipped), so <code>BeanModelSource beanModelSource = new BeanModelSourceBuilder().build()</code>
+ * (and usually are skipped), so <code>BeanModelSource beanModelSource = new BeanModelSourceBuilder().build();</code>
  * is all you need to do. 
-=======
- * Utility class for creating {@link BeanModelSource} instances without
- * Tapestry-IoC. Usage of Tapestry-IoC is still recommended.
->>>>>>> 696bc7ae848f4b4f2421ff77ceb4858a2f10465c
  */
 public class BeanModelSourceBuilder {
 


Mime
View raw message