final update

jomjol · Mar 16, 2021 · 3b3d924 · 3b3d924
1 parent 60701bc
commit 3b3d924
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/code/main/version.cpp b/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";
diff --git a/firmware/firmware.bin b/firmware/firmware.bin