From c5fb0d82a8faf1cb0ec0b47decd6a5e7d459c09f Mon Sep 17 00:00:00 2001
From: Erik Frojdh <erik.frojdh@psi.ch>
Date: Wed, 2 Sep 2026 13:36:21 +0200
Subject: [PATCH] cleanup

---
 RELEASE.md | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/RELEASE.md b/RELEASE.md
index 726f3948..23f385aa 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -192,10 +192,3 @@ alice.mazzoleni@psi.ch \
 dhanya.thattil@psi.ch
 
 
-
-
-<<<<<<< HEAD
-=======
-
-
->>>>>>> main