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

conflict git

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-07-03 17:44:52 +02:00
parent 374b07a126
commit 1e50bc4cc0
2 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
slsDetectorSoftware/gitInfo.txt
View File

@ -1,18 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware Path: slsDetectorsPackage/slsDetectorSoftware
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git 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 Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
<<<<<<< HEAD Repsitory UUID: 79271ea7e3f5ac7113582e694b30b71a64d18844
Repsitory UUID: f296ac9eb68e7681675cad9943f5054eb7f8bdce Revision: 1436
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
Branch: developer Branch: developer
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 1437 Last Changed Rev: 1441
Last Changed Date: 2017-07-03 13:32:10 +0200 Last Changed Date: 2017-07-03 17:42:06 +0200
>>>>>>> developer

15
slsDetectorSoftware/slsDetector/gitInfoLib.h
View File

@ -1,20 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURLLIB "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" #define SVNURLLIB "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
//#define SVNREPPATH "" //#define SVNREPPATH ""
<<<<<<< HEAD #define SVNREPUUIDLIB "79271ea7e3f5ac7113582e694b30b71a64d18844"
#define SVNREPUUIDLIB "f296ac9eb68e7681675cad9943f5054eb7f8bdce" //#define SVNREV 0x1441
//#define SVNREV 0x1438
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTHLIB "Dhanya_Maliakal" #define SVNAUTHLIB "Dhanya_Maliakal"
#define SVNREVLIB 0x1438 #define SVNREVLIB 0x1441
=======
#define SVNREPUUIDLIB "788060fd5a954e42fea270b25b8a398293013e96"
//#define SVNREV 0x1437
//#define SVNKIND ""
//#define SVNSCHED ""
#define SVNAUTHLIB "Dhanya_Maliakal"
#define SVNREVLIB 0x1437
>>>>>>> developer
#define SVNDATELIB 0x20170703 #define SVNDATELIB 0x20170703
// //