From 71f08adb67e8e36eeec2166176bcd9b96b3d9414 Mon Sep 17 00:00:00 2001 From: Juan Jose Nicola Date: Thu, 12 Aug 2021 04:20:31 -0500 Subject: [PATCH] Fix conflict in changelog --- CHANGELOG.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8de5d72a..058dabf1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,16 +12,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). [#395](https://github.com/greenbone/ospd/pull/395) ### Changed -<<<<<<< HEAD - Set Log Timestamp to UTC. [#394](https://github.com/greenbone/ospd-openvas/pull/394) - Stopping scan. [#432](https://github.com/greenbone/ospd/pull/432) -======= -- Use better defaults for file paths and permissions [#429](https://github.com/greenbone/ospd/pull/429) - ### Deprecated -### Removed ->>>>>>> 352d01e (Add changelog entry) ### Fixed ### Removed - Remove dry run from ospd. [#402](https://github.com/greenbone/ospd-openvas/pull/402) @@ -34,6 +28,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Add target option for supplying dedicated port list for alive detection (Boreas only) via OSP. [#323](https://github.com/greenbone/ospd/pull/323) - Add target option for supplying alive test methods via separate elements. [#329](https://github.com/greenbone/ospd/pull/329) +### Changed +- Use better defaults for file paths and permissions [#429](https://github.com/greenbone/ospd/pull/429) + ### Removed - Remove python3.5 support and deprecated methods. [#316](https://github.com/greenbone/ospd/pull/316)