Fix imports after git merge
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/8ba46022 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/8ba46022 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/8ba46022 Branch: refs/heads/master Commit: 8ba460226bdef46f69459d7f89af1ae7eb141e93 Parents: 3d03a6a Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Nov 2 16:29:16 2012 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Nov 2 16:29:16 2012 +0200 ---------------------------------------------------------------------- .../mapper/BasicResourceReferenceMapper.java | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/8ba46022/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.java index a9c4b5c..02bf367 100755 --- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.java +++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.java @@ -26,12 +26,11 @@ import org.apache.wicket.request.Url; import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler; import org.apache.wicket.request.mapper.parameter.IPageParametersEncoder; import org.apache.wicket.request.mapper.parameter.PageParameters; -import org.apache.wicket.request.resource.ResourceReferenceRegistry; -import org.apache.wicket.request.resource.UrlResourceReference; import org.apache.wicket.request.resource.IResource; import org.apache.wicket.request.resource.MetaInfStaticResourceReference; import org.apache.wicket.request.resource.ResourceReference; import org.apache.wicket.request.resource.ResourceReferenceRegistry; +import org.apache.wicket.request.resource.UrlResourceReference; import org.apache.wicket.request.resource.caching.IResourceCachingStrategy; import org.apache.wicket.request.resource.caching.IStaticCacheableResource; import org.apache.wicket.request.resource.caching.ResourceUrl; @@ -39,7 +38,6 @@ import org.apache.wicket.resource.bundles.ResourceBundleReference; import org.apache.wicket.util.IProvider; import org.apache.wicket.util.lang.Args; import org.apache.wicket.util.lang.Checks; -import org.apache.wicket.util.lang.WicketObjects; import org.apache.wicket.util.string.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory;
