fix conflicts

This commit is contained in:
Gabor Kiss-Vamosi
2021-03-18 17:31:09 +01:00
226 changed files with 1360 additions and 1348 deletions
+1 -1
View File
@@ -34,7 +34,7 @@ void lv_example_scroll_3(void);
**********************/
#ifdef __cplusplus
} /* extern "C" */
} /*extern "C"*/
#endif
#endif /*LV_EXAMPLE_SCROLL_H*/