version.cpp 300 B

1234567891011
  1. <<<<<<< HEAD
  2. const char* GIT_REV="5f0f180";
  3. const char* GIT_TAG="";
  4. const char* GIT_BRANCH="master";
  5. const char* BUILD_TIME="2021-03-14 12:56";
  6. =======
  7. const char* GIT_REV="5be56d9";
  8. const char* GIT_TAG="";
  9. const char* GIT_BRANCH="rolling";
  10. const char* BUILD_TIME="2021-03-16 20:48";
  11. >>>>>>> rolling