From ded9dd470d76cc122e8d63bbdfa979993b50a157 Mon Sep 17 00:00:00 2001
From: missytake <missytake@systemli.org>
Date: Thu, 6 Nov 2025 16:19:02 +0100
Subject: [PATCH] www: add changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4f1eb9a..3729fa1d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## untagged
 
+- don't deploy the website if there are merge conflicts in the www folder
+  ([#714](https://github.com/chatmail/relay/pull/714))
+
 - acmetool: use ECDSA keys instead of RSA
   ([#689](https://github.com/chatmail/relay/pull/689))