This is an automated email from the ASF dual-hosted git repository. pauls pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-launcher.git
commit c893ddb8920bd45ddbb2b26cc8ccb41014022935 Merge: e9e01ee 98e5a20 Author: Karl Pauls <[email protected]> AuthorDate: Thu Aug 22 08:29:59 2019 +0200 Merge pull request #14 from apache/issues/SLING-8647 SLING-8647: Provide policies for configuration merging pom.xml | 2 +- .../org/apache/sling/feature/launcher/impl/FeatureProcessor.java | 1 + .../org/apache/sling/feature/launcher/impl/LauncherConfig.java | 7 +++++++ src/main/java/org/apache/sling/feature/launcher/impl/Main.java | 8 ++++++++ 4 files changed, 17 insertions(+), 1 deletion(-)
