github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

solve conflicts

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2021-03-31 19:58:53 +02:00
parent 663bcfd030 07a9b3232d
commit 5c991aaf71
15 changed files with 105 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/widgets/arc/lv_example_arc_1.c
View File

@@ -2,7 +2,7 @@
#if LV_USE_ARC && LV_BUILD_EXAMPLES
void lv_example_arc_1(void)
void lv_example_arc_1(void)
{
/*Create an Arc*/
lv_obj_t * arc = lv_arc_create(lv_scr_act());

2
examples/widgets/arc/lv_example_arc_2.c
View File

@@ -1,4 +1,4 @@
#include "../../../lvgl.h"
#include "../../../lvgl.h"
#if LV_USE_ARC && LV_BUILD_EXAMPLES