final update

Author: jomjol

code/main/version.cpp

@@ -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";