This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.4.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
commit 6822d75ec4f6d9720d4323069edef358054a0777
Merge: 8c7b2acdc2 f84ab0b39a
Author: JB Onofré <jbono...@apache.org>
AuthorDate: Thu Mar 28 14:47:46 2024 +0100
Merge pull request #1817 from grgrzybek/KARAF-7799-4.4
[KARAF-7799] Allow merging of org.apache.karaf.features.xml definitions
.../org/apache/karaf/profile/assembly/Builder.java | 30 ++++++++++++++++++++--
1 file changed, 28 insertions(+), 2 deletions(-)
