fixed merge conflicts

This commit is contained in:
Jakob.Meier
2021-07-23 14:36:15 +02:00
46 changed files with 1648 additions and 351 deletions

View File

@ -4,7 +4,7 @@
const char* const SW_NAME = "eive";
#define SW_VERSION 1
#define SW_SUBVERSION 2
#define SW_SUBVERSION 3
#define SW_SUBSUBVERSION 0
#endif /* COMMON_CONFIG_OBSWVERSION_H_ */