final update

This commit is contained in:
jomjol
2021-03-16 21:14:09 +01:00
parent 60701bc007
commit 3b3d924f40
2 changed files with 2 additions and 9 deletions

View File

@@ -1,11 +1,4 @@
<<<<<<< HEAD
const char* GIT_REV="5f0f180";
const char* GIT_REV="60701bc";
const char* GIT_TAG="";
const char* GIT_BRANCH="master";
const char* BUILD_TIME="2021-03-14 12:56";
=======
const char* GIT_REV="5be56d9";
const char* GIT_TAG="";
const char* GIT_BRANCH="rolling";
const char* BUILD_TIME="2021-03-16 20:48";
>>>>>>> rolling
const char* BUILD_TIME="2021-03-16 21:11";

Binary file not shown.