From d4deb2866344a8492bfa466637b5c8c96b3ffe38 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Mon, 26 Apr 2021 11:25:34 +0200 Subject: [PATCH] fix(label) remove duplicated prototypse (coming from merge conflicts) --- src/widgets/lv_label.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/widgets/lv_label.h b/src/widgets/lv_label.h index 7aad87620..605c5c7be 100644 --- a/src/widgets/lv_label.h +++ b/src/widgets/lv_label.h @@ -159,20 +159,8 @@ char * lv_label_get_text(const lv_obj_t * obj); /** * Get the long mode of a label -<<<<<<< HEAD * @param obj pointer to a label object * @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);