From 0358b0160a21682d3f86efdfe02181c7d1c44d9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= <bjoern.ricks@greenbone.net>
Date: Thu, 1 Jul 2021 12:48:40 +0200
Subject: [PATCH] Add changelog entry

(cherry picked from commit e92f4b6be30ee886f581771bbaa7cda531938693)

# Conflicts:
#	CHANGELOG.md
---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa4dba3c4..d017545ae 100644
--- 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)