From 0067b4e1c8533513625de12a984ff3abca02d649 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 8 Mar 2026 19:05:56 +0100
Subject: [PATCH] doc: update changelog

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d54a49..3981716 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,6 @@
 * add compatibility with NC33
 ### Fixed
 * fix #468: force nextcloud logo display css rule (opener-only)
->>>>>>> develop
 
 ## 5.1.3
 ### Fixed