conflict gitversion

This commit is contained in:
Dhanya Maliakal
2017-07-03 17:45:06 +02:00
parent 460a44a9b1
commit 14bba171e7
2 changed files with 8 additions and 8 deletions

View File

@ -1,11 +1,11 @@
//#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_receiver_software.git"
//#define SVNREPPATH ""
#define SVNREPUUID "93d7b6862d591a0615e8f6f710aca7c69040dd97"
//#define SVNREV 0x606
#define SVNREPUUID "95d1843ad9c5f8e6b73d305d43d102c823d564f3"
//#define SVNREV 0x607
//#define SVNKIND ""
//#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x606
#define SVNREV 0x607
#define SVNDATE 0x20170703
//