Merge fixes

radio/src/gui/gui_common.cpp

@@ -1096,15 +1096,6 @@ const mm_protocol_definition *getMultiProtocolDefinition (uint8_t protocol)
 }
 #endif
 
-void editStickHardwareSettings(coord_t x, coord_t y, int idx, event_t event, LcdFlags flags)
-{
-  lcdDrawTextAtIndex(INDENT_WIDTH, y, STR_VSRCRAW, idx+1, 0);
-  if (ZEXIST(g_eeGeneral.anaNames[idx]) || (flags && s_editMode > 0))
-    editName(x, y, g_eeGeneral.anaNames[idx], LEN_ANA_NAME, event, flags);
-  else
-    lcdDrawMMM(x, y, flags);
-}
-
 #if defined(MULTIMODULE)
 const char * getMultiOptionTitle(uint8_t moduleIdx)
 {