Resolve changelog conflict in backport of #1508

greenbone · May 3, 2021 · b3be70d · b3be70d
1 parent 9cbe65b
commit b3be70d
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -88,11 +88,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Changed
 - Improve report counts performance [#1438](https://github.com/greenbone/gvmd/pull/1438)
-<<<<<<< HEAD
-=======
 - Clean up log config, add gvm-libs log domains [#1502](https://github.com/greenbone/gvmd/pull/1502)
 - Sort missing severity as lowest value in GMP get [#1508](https://github.com/greenbone/gvmd/pull/1508)
->>>>>>> 89c41423a... Add CHANGELOG entry for severity sorting change
 
 ### Fixed
 - Also create owner WITH clause for single resources [#1406](https://github.com/greenbone/gvmd/pull/1406)