Resolve merge conflict

CHANGELOG.md

@@ -9,18 +9,14 @@ The Dovecot and Postfix overrides are moved in their own sub-directory.
 If there are local override files, they will need to be moved from overrides/ to overrides/dovecot and overrides/postfix/.
 See https://mailu.io/1.8/faq.html#how-can-i-override-settings for all the mappings.
 
-<<<<<<< HEAD
+One major change for the docker compose file is that the antispam container needs a fixed hostname [#1837](https://github.com/Mailu/Mailu/issues/1837).
-Please note that the shipped image for PostgreSQL database is deprecated.
+This is handled when you regenerate the docker-compose file. A fixed hostname is required to retain rspamd history. 
-We advise to switch to an external database server.
+This is also handled in the helm-chart repo.
-=======
-One major change for the docker compose file is that the antispam needs a fixed hostname [#1837](https://github.com/Mailu/Mailu/issues/1837).
-This is handled when you regenerate the docker-compose file. A fixed hostname is required to retain rspamd history.
 
 Please not that the shipped image for PostgreSQL database is deprecated.
 We advise to switch to an external PostgreSQL database server.
->>>>>>> afaacf5a... Update CHANGELOG.md and process towncrier newsfragments.
 
-<!-- TOWNCRIER -->
+
 1.8.0 - 2021-08-06
 --------------------