From 466d43108148f668cd2975a8485e130e076e74d2 Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Tue, 10 May 2022 15:35:44 +0200
Subject: [PATCH] update release notes

---
 RELEASE.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASE.txt b/RELEASE.txt
index ade2e3a0d..28d4ef047 100755
--- a/RELEASE.txt
+++ b/RELEASE.txt
@@ -62,13 +62,13 @@ This document describes the differences between v7.0.0 and v6.x.x
 - m3 polarity, interpolation (enables all counters when enabled), pump probe, analog pulsing, digital pulsing
 - updatedetectorserver - removes old server current binary pointing to for blackfin
 - removing copydetectorserver using tftp 
->>>>>>> developer
 - registerCallBackRawDataReady and registerCallBackRawDataModifyReady now gives a sls_receiver_header* instead of a char*, and uint32_t to size_t
 - registerCallBackStartAcquisition gave incorrect imagesize (+120 bytes). corrected.
 - registerCallBackStartAcquisition parameter is a const string reference
 - m3 (runnig config second time with tengiga 0, dr !=32, counters !=0x7) calculated incorrect image size expected
 - fixed row column indexing (mainly for multi module Jungfrau 2 interfaces )
 - eiger gui row indices not flipped anymore (fix in config)
+- m3 (settings dac check disabled temporarily?)
 
 2. Resolved Issues
 ==================