You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@sling.apache.org by di...@apache.org on 2022/02/11 15:52:38 UTC

[sling-org-apache-sling-resourceresolver] 02/02: Merge branch 'issue/SLING-11138' into issue/SLING-4856

This is an automated email from the ASF dual-hosted git repository.

diru pushed a commit to branch issue/SLING-4856
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git

commit 8b21f69a8b42a9c1fc5517d91a37852f32a4909b
Merge: 7b7367b 9e59c98
Author: Dirk Rudolph <dr...@adobe.com>
AuthorDate: Fri Feb 11 16:52:22 2022 +0100

    Merge branch 'issue/SLING-11138' into issue/SLING-4856

 .../org/apache/sling/resourceresolver/impl/mapping/MapEntry.java  | 2 +-
 .../sling/resourceresolver/impl/mapping/ResourceMapperImpl.java   | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)