fix build errors

2020-12-02 09:25:48 +01:00
parent d51bb29c24
commit 70d00469c6
3 changed files with 6 additions and 208 deletions
--- a/lvgl.h
+++ b/lvgl.h
@@ -14,15 +14,9 @@ extern "C" {
 /***************************
 * CURRENT VERSION OF LVGL
 ***************************/
-<<<<<<< HEAD
 #define LVGL_VERSION_MAJOR 8
 #define LVGL_VERSION_MINOR 0
 #define LVGL_VERSION_PATCH 0
-=======
-#define LVGL_VERSION_MAJOR 7
-#define LVGL_VERSION_MINOR 8
-#define LVGL_VERSION_PATCH 1
->>>>>>> master
 #define LVGL_VERSION_INFO "dev"

 /*********************