From fb8f59fa1d8a4f0232a68cdf17cd53882c00b8d0 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Wed, 15 May 2024 19:04:37 +0300
Subject: [PATCH] fix merge issues

---
 applications/services/gui/modules/submenu.c | 20 --------------------
 applications/services/gui/modules/submenu.h |  8 --------
 2 files changed, 28 deletions(-)

diff --git a/applications/services/gui/modules/submenu.c b/applications/services/gui/modules/submenu.c
index 941784b00..74f93320f 100644
--- a/applications/services/gui/modules/submenu.c
+++ b/applications/services/gui/modules/submenu.c
@@ -338,26 +338,6 @@ void submenu_change_item_label(Submenu* submenu, uint32_t index, const char* lab
         true);
 }
 
-void submenu_change_item_label(Submenu* submenu, uint32_t index, const char* label) {
-    furi_check(submenu);
-    furi_check(label);
-
-    with_view_model(
-        submenu->view,
-        SubmenuModel * model,
-        {
-            SubmenuItemArray_it_t it;
-            for(SubmenuItemArray_it(it, model->items); !SubmenuItemArray_end_p(it);
-                SubmenuItemArray_next(it)) {
-                if(index == SubmenuItemArray_cref(it)->index) {
-                    furi_string_set_str(SubmenuItemArray_cref(it)->label, label);
-                    break;
-                }
-            }
-        },
-        true);
-}
-
 void submenu_reset(Submenu* submenu) {
     furi_check(submenu);
     view_set_orientation(submenu->view, ViewOrientationHorizontal);
diff --git a/applications/services/gui/modules/submenu.h b/applications/services/gui/modules/submenu.h
index c6aa49331..d77f570c2 100644
--- a/applications/services/gui/modules/submenu.h
+++ b/applications/services/gui/modules/submenu.h
@@ -81,14 +81,6 @@ void submenu_add_lockable_item(
  */
 void submenu_change_item_label(Submenu* submenu, uint32_t index, const char* label);
 
-/** Change label of an existing item
- * 
- * @param      submenu  Submenu instance
- * @param      index    The index of the item
- * @param      label    The new label
- */
-void submenu_change_item_label(Submenu* submenu, uint32_t index, const char* label);
-
 /** Remove all items from submenu
  *
  * @param      submenu  Submenu instance