Add changelog entry

(cherry picked from commit e92f4b6) # Conflicts: # CHANGELOG.md
greenbone · Jul 1, 2021 · 0358b01 · 0358b01
1 parent 77b0ae9
commit 0358b01
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Add dry run support. Generate 10 fake results per host. [#424](https://github.com/greenbone/ospd-openvas/pull/424)
 
 ### Changed
+<<<<<<< HEAD
+=======
+- Use better defaults for for ospd-openvas settings [#454](https://github.com/greenbone/ospd-openvas/pull/454)
+
+### Deprecated
+>>>>>>> e92f4b6 (Add changelog entry)
 ### Removed
 
 - Remove source_iface preferences. [#418](https://github.com/greenbone/ospd-openvas/pull/418)