diff options
| author | Olivier Lamy <olamy@apache.org> | 2022-06-02 13:42:00 +1000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2022-06-02 13:42:00 +1000 |
| commit | a1762710cc68fe5acbb5beaee654c42024468b44 (patch) | |
| tree | 8e6f6083d943bd3ce8d81b869bc27fb15aefd743 | |
| parent | 7d09fb741bb19e600ee33b0c25e1927b701e2bbc (diff) | |
| download | archiva-a1762710cc68fe5acbb5beaee654c42024468b44.tar.gz archiva-a1762710cc68fe5acbb5beaee654c42024468b44.zip | |
fix bad merge
Signed-off-by: Olivier Lamy <olamy@apache.org>
| -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 |