fix conflicts

2019-09-26 15:24:47 +02:00
parent 1439877958 0a9eeba4e4
commit fa6ae44f0f
64 changed files with 7604 additions and 10857 deletions
--- a/lvgl.h
+++ b/lvgl.h
@@ -28,6 +28,7 @@ extern "C" {

 #include "src/lv_core/lv_refr.h"
 #include "src/lv_core/lv_disp.h"
+#include "src/lv_core/lv_debug.h"

 #include "src/lv_themes/lv_theme.h"