This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git
commit 638e3ae8d24eb16b6ec76ba9469bd1607f7374e4
Merge: d111ee4b8b 2e417d0889
Author: JB Onofré <jbono...@apache.org>
AuthorDate: Thu Mar 28 14:47:24 2024 +0100
Merge pull request #1818 from grgrzybek/KARAF-7799-main
[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(-)
