This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git
The following commit(s) were added to refs/heads/master by this push:
new a1762710c fix bad merge
a1762710c is described below
commit a1762710cc68fe5acbb5beaee654c42024468b44
Author: Olivier Lamy <[email protected]>
AuthorDate: Thu Jun 2 13:42:00 2022 +1000
fix bad merge
Signed-off-by: Olivier Lamy <[email protected]>
---
archiva-docs/src/site/apt/release-notes.apt.vm | 3 ---
1 file changed, 3 deletions(-)
diff --git a/archiva-docs/src/site/apt/release-notes.apt.vm
b/archiva-docs/src/site/apt/release-notes.apt.vm
index c5df67d5f..8c4e5fcfb 100644
--- a/archiva-docs/src/site/apt/release-notes.apt.vm
+++ b/archiva-docs/src/site/apt/release-notes.apt.vm
@@ -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
