Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix bad merge 

Signed-off-by: Olivier Lamy <olamy@apache.org>
This commit is contained in:
Olivier Lamy 2022-06-02 13:42:00 +10:00
parent 7d09fb741b
commit a1762710cc
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
archiva-docs/src/site/apt/release-notes.apt.vm
View File

@ -36,9 +36,6 @@ Release Notes for Archiva ${project.version}
* New in Archiva ${project.version}
<<<<<<< Updated upstream
Apache Archiva ${project.version} is a bug fix release:
=======
Apache Archiva ${project.version} is a security fix release:
** Compatibility Changes