mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-22 03:40:04 +02:00
15 lines
449 B
C
15 lines
449 B
C
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
|
|
<<<<<<< HEAD
|
|
#define GITREPUUID "92b4b3324e09299663b9862bad26b38a3257dd60"
|
|
#define GITAUTH "Andrä_Marie"
|
|
#define GITREV 0x3570
|
|
#define GITDATE 0x20180119
|
|
#define GITBRANCH "developer"
|
|
=======
|
|
#define GITREPUUID "b389402d647e939342dbb2c9317c688c0eb6b105"
|
|
#define GITAUTH "Erik_Frojdh"
|
|
#define GITREV 0x3458
|
|
#define GITDATE 0x20180312
|
|
#define GITBRANCH "3.1.0-rc"
|
|
>>>>>>> 3.1.0
|