detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-02-04 10:08:41 +01: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

8
slsDetectorServers/ctbDetectorServer/gitInfo.txt
View File

@@ -1,9 +1,9 @@
Path: slsDetectorPackage/slsDetectorServers/ctbDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 5bf37a4f0d840820e676f11419e98c0203d700eb
Revision: 44
Repsitory UUID: 7cd5bc8b2db6e89fbec4c06c65e683cf788338c0
Revision: 46
Branch: jungfrau
Last Changed Author: Dhanya_Thattil
Last Changed Rev: 4472
Last Changed Date: 2019-03-22 14:25:24.000000002 +0100 ../slsDetectorServer/ALTERA_PLL.h
Last Changed Rev: 4474
Last Changed Date: 2019-03-26 15:01:04.000000002 +0100 ./slsDetectorServer_defs.h