diff options
| -rw-r--r-- | archiva-docs/src/site/apt/release-notes.apt.vm | 3 |
1 files changed, 0 insertions, 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 |