You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/06/20 12:12:35 UTC
git commit: Wrong commit in master,
followed by a wrong merge in 6.x. Reverting the bad part
Updated Branches:
refs/heads/wicket-6.x 99dc1caa7 -> 010728d36
Wrong commit in master, followed by a wrong merge in 6.x. Reverting the bad part
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/010728d3
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/010728d3
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/010728d3
Branch: refs/heads/wicket-6.x
Commit: 010728d366ef8be06152beb6e7800edc156e1562
Parents: 99dc1ca
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Jun 20 12:11:51 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Jun 20 12:11:51 2013 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/markup/html/image/Image.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/010728d3/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java
index 93d4475..c024985 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java
@@ -139,7 +139,7 @@ public class Image extends WebComponent implements IResourceListener
*/
public Image(final String id, final String string)
{
- this(id, new Model<>(string));
+ this(id, new Model<String>(string));
}
/**