This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git
from d111ee4b8b Merge pull request #1822 from awrb/KARAF-7804
add 2e417d0889 [KARAF-7799] Allow merging of org.apache.karaf.features.xml
definitions
new 638e3ae8d2 Merge pull request #1818 from grgrzybek/KARAF-7799-main
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/karaf/profile/assembly/Builder.java | 30 ++++++++++++++++++++--
1 file changed, 28 insertions(+), 2 deletions(-)
