detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-18 07:47:12 +02:00
Code Issues Actions Packages Releases Activity

conflict git fix

Browse Source
This commit is contained in:
maliakal_d
2019-03-26 15:01:58 +01:00
parent 7cd5bc8b2d 8c2ee57591
commit c7ad548e4c
9 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorServers/ctbDetectorServer/gitInfoCtb.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "5bf37a4f0d840820e676f11419e98c0203d700eb"
#define GITREPUUID "7cd5bc8b2db6e89fbec4c06c65e683cf788338c0"
#define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4472
#define GITDATE 0x20190322
#define GITREV 0x4474
#define GITDATE 0x20190326
#define GITBRANCH "jungfrau"