Fix merge conflict

gloomyandy · Oct 17, 2021 · 4416d30 · 4416d30
1 parent c21a649
commit 4416d30
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/Version.h b/src/Version.h
@@ -9,12 +9,8 @@
 #define SRC_VERSION_H_
 
 #ifndef VERSION
-<<<<<<< HEAD
 // Note: the complete VERSION string must be in standard version number format and must not contain spaces! This is so that DWC can parse it.
 # define MAIN_VERSION	"3.4.0beta5_1"
-=======
-# define MAIN_VERSION	"3.3.0_10"
->>>>>>> v3.3-dev
 # ifdef USE_CAN0
 #  define VERSION_SUFFIX	"(CAN0)"
 # else