Mirror/AI-on-the-edge-device
1
0
Fork 0
mirror of https://github.com/jomjol/AI-on-the-edge-device.git synced 2026-01-27 21:00:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rolling' into master

Browse Source
This commit is contained in:
jomjol
2021-03-16 21:10:07 +01:00
parent 2903d1a0a6 5ca3e184e0
commit 60701bc007
8 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/main/version.cpp
View File

@@ -1,4 +1,11 @@
<<<<<<< HEAD
const char* GIT_REV="5f0f180";
const char* GIT_TAG="";
const char* GIT_BRANCH="master";
const char* BUILD_TIME="2021-03-14 12:56";
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