Resolve changelog conflict in backport of #1498

greenbone · Apr 20, 2021 · c257ec5 · c257ec5
1 parent b3b9fcd
commit c257ec5
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,11 +12,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Use pg-gvm extension for C PostgreSQL functions [#1400](https://github.com/greenbone/gvmd/pull/1400), [#1453](https://github.com/greenbone/gvmd/pull/1453)
 
 ### Fixed
-<<<<<<< HEAD
-=======
 - Improve VT version handling for CVE & OVAL results [#1496](https://github.com/greenbone/gvmd/pull/1496)
 - Fix migration to DB version 242 from gvmd 20.08 [#1498](https://github.com/greenbone/gvmd/pull/1498)
->>>>>>> 1cd170fb1... Add CHANGELOG entry for migration fix
 
 ### Removed