From 1e50bc4cc09708d9f8bde94245ef4ac6120c2941 Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Mon, 3 Jul 2017 17:44:52 +0200
Subject: [PATCH] conflict git

---
 slsDetectorSoftware/gitInfo.txt              | 17 ++++-------------
 slsDetectorSoftware/slsDetector/gitInfoLib.h | 15 +++------------
 2 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/slsDetectorSoftware/gitInfo.txt b/slsDetectorSoftware/gitInfo.txt
index 964586c8f..03c0f5622 100644
--- a/slsDetectorSoftware/gitInfo.txt
+++ b/slsDetectorSoftware/gitInfo.txt
@@ -1,18 +1,9 @@
 Path: slsDetectorsPackage/slsDetectorSoftware 
 URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git 
 Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git 
-<<<<<<< HEAD
-Repsitory UUID: f296ac9eb68e7681675cad9943f5054eb7f8bdce 
-Revision: 1433 
-Branch: updaterec 
-Last Changed Author: Dhanya_Maliakal 
-Last Changed Rev: 1438 
-Last Changed Date: 2017-07-03 13:46:06 +0200
-=======
-Repsitory UUID: 788060fd5a954e42fea270b25b8a398293013e96 
-Revision: 1432 
+Repsitory UUID: 79271ea7e3f5ac7113582e694b30b71a64d18844 
+Revision: 1436 
 Branch: developer 
 Last Changed Author: Dhanya_Maliakal 
-Last Changed Rev: 1437 
-Last Changed Date: 2017-07-03 13:32:10 +0200
->>>>>>> developer
+Last Changed Rev: 1441 
+Last Changed Date: 2017-07-03 17:42:06 +0200
diff --git a/slsDetectorSoftware/slsDetector/gitInfoLib.h b/slsDetectorSoftware/slsDetector/gitInfoLib.h
index 2c01c4fb2..c134bfad7 100644
--- a/slsDetectorSoftware/slsDetector/gitInfoLib.h
+++ b/slsDetectorSoftware/slsDetector/gitInfoLib.h
@@ -1,20 +1,11 @@
 //#define SVNPATH ""
 #define SVNURLLIB "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
 //#define SVNREPPATH ""
-<<<<<<< HEAD
-#define SVNREPUUIDLIB "f296ac9eb68e7681675cad9943f5054eb7f8bdce"
-//#define SVNREV 0x1438
+#define SVNREPUUIDLIB "79271ea7e3f5ac7113582e694b30b71a64d18844"
+//#define SVNREV 0x1441
 //#define SVNKIND ""
 //#define SVNSCHED ""
 #define SVNAUTHLIB "Dhanya_Maliakal"
-#define SVNREVLIB 0x1438
-=======
-#define SVNREPUUIDLIB "788060fd5a954e42fea270b25b8a398293013e96"
-//#define SVNREV 0x1437
-//#define SVNKIND ""
-//#define SVNSCHED ""
-#define SVNAUTHLIB "Dhanya_Maliakal"
-#define SVNREVLIB 0x1437
->>>>>>> developer
+#define SVNREVLIB 0x1441
 #define SVNDATELIB 0x20170703
 //