Fix conflict

ArnoStiefvater · Aug 18, 2021 · b5e910b · b5e910b
1 parent bc2b4c4
commit b5e910b
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,11 +7,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [21.10.0] (unreleased)
 
 ### Added
-<<<<<<< HEAD
 - Add method to validate port lists. 
   [#393](https://github.com/greenbone/ospd/pull/393)
   [#395](https://github.com/greenbone/ospd/pull/395)
-=======
 ### Changed
 - Use better defaults for file paths and permissions [#429](https://github.com/greenbone/ospd/pull/429)
 - Downgrade required version for psutil to 5.5.1 [#453](https://github.com/greenbone/ospd/pull/453)
@@ -23,7 +21,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 [Unreleased]: https://github.com/greenbone/ospd/compare/v21.4.3...HEAD
 
 ## [21.4.3] - 2021-08-04
->>>>>>> 4f13f89 (Downgrade required version for psutil to 5.5.1)
 
 ### Changed
 - Set Log Timestamp to UTC. [#394](https://github.com/greenbone/ospd-openvas/pull/394)