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

fix(label) remove duplicated prototypse (coming from merge conflicts)

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2021-04-26 11:25:34 +02:00
parent 2d459c86d3
commit d4deb28663
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/widgets/lv_label.h
View File

@@ -159,20 +159,8 @@ char * lv_label_get_text(const lv_obj_t * obj);
/** /**
* Get the long mode of a label * Get the long mode of a label
<<<<<<< HEAD
* @param obj pointer to a label object * @param obj pointer to a label object
* @return the current long mode * @return the current long mode
=======
* @param label pointer to a label object
* @return the long mode
*/
lv_label_long_mode_t lv_label_get_long_mode(const lv_obj_t * label);
/**
* Get the align attribute
* @param label pointer to a label object
* @return LV_LABEL_ALIGN_LEFT/RIGHT/CENTER
>>>>>>> master
*/ */
lv_label_long_mode_t lv_label_get_long_mode(const lv_obj_t * obj); lv_label_long_mode_t lv_label_get_long_mode(const lv_obj_t * obj);