From a1762710cc68fe5acbb5beaee654c42024468b44 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 2 Jun 2022 13:42:00 +1000 Subject: [PATCH] fix bad merge Signed-off-by: Olivier Lamy --- 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