references #226: solve conflict

evb/include/evb/version.h

@@ -4,14 +4,9 @@
 #include "config/PackageInfo.h"
 
 #define WORKSUITE_EVB_VERSION_MAJOR 6
-<<<<<<< HEAD
 #define WORKSUITE_EVB_VERSION_MINOR 8
-#define WORKSUITE_EVB_VERSION_PATCH 0
-=======
-#define WORKSUITE_EVB_VERSION_MINOR 7
-#define WORKSUITE_EVB_VERSION_PATCH 2
->>>>>>> references #226: increment version number
-#define WORKSUITE_EVB_PREVIOUS_VERSIONS "6.5.0,6.5.1,6.5.2,6.6.0,6.6.1,6.7.0,6.7.1"
+#define WORKSUITE_EVB_VERSION_PATCH 1
+#define WORKSUITE_EVB_PREVIOUS_VERSIONS "6.5.0,6.5.1,6.5.2,6.6.0,6.6.1,6.7.0,6.7.1,6.8.0"
 
 #define WORKSUITE_EVB_VERSION_CODE PACKAGE_VERSION_CODE(WORKSUITE_EVB_VERSION_MAJOR,WORKSUITE_EVB_VERSION_MINOR,WORKSUITE_EVB_VERSION_PATCH)
 #ifndef WORKSUITE_EVB_PREVIOUS_VERSIONS