From 4cd027507dfd58adced457b5ba9222a4259733a5 Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Mon, 31 Jan 2022 08:37:05 +0100
Subject: [PATCH] updated release notes

---
 RELEASE.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/RELEASE.txt b/RELEASE.txt
index 36f5a071d..8a9e9d611 100755
--- a/RELEASE.txt
+++ b/RELEASE.txt
@@ -26,11 +26,8 @@ This document describes the differences between v6.1.0 and v6.0.0.
 - refactoring (rxr)
 - fixed patsetbit and patsetmask for moench
 - changed default vref of adc9257 to 2V for moench (from 1.33V)
-<<<<<<< HEAD
 - moench and ctb - can set the starting frame number of next acquisition
-=======
 - mythen server kernel check incompatible (cet timezone)
->>>>>>> developer