Fix merge

avr_isp/helpers/avr_isp_worker.c

@@ -36,8 +36,7 @@ struct AvrIspWorker {
 //########################/* VCP CDC */#############################################
 #include "usb_cdc.h"
 #include <cli/cli_vcp.h>
-#include <toolbox/cli/cli_command.h>
-#include <cli/cli_main_commands.h>
+#include <cli/cli.h>
 #include <furi_hal_usb_cdc.h>
 
 #define AVR_ISP_VCP_CDC_CH           1

flip_world/callback/free.c

@@ -53,7 +53,7 @@ void free_text_input_view(void *context)
     if (app->text_input)
     {
         view_dispatcher_remove_view(app->view_dispatcher, FlipWorldViewTextInput);
-        uart_text_input_free(app->text_input);
+        text_input_free(app->text_input);
         app->text_input = NULL;
     }
     if (app->text_input_buffer)

gpio_reader_b/usb_uart_bridge.c

@@ -4,8 +4,7 @@
 #include "usb_cdc.h"
 #include "cli/cli_vcp.h"
 #include <toolbox/api_lock.h>
-#include <toolbox/cli/cli_command.h>
-#include <cli/cli_main_commands.h>
+#include "cli/cli.h"
 
 #define USB_CDC_PKT_LEN      CDC_DATA_SZ
 #define USB_UART_RX_BUF_SIZE (USB_CDC_PKT_LEN * 5)

swd_probe/usb_uart.c

@@ -7,8 +7,7 @@
 #include "usb_cdc.h"
 #include "cli/cli_vcp.h"
 #include <toolbox/api_lock.h>
-#include <toolbox/cli/cli_command.h>
-#include <cli/cli_main_commands.h>
+#include "cli/cli.h"
 
 #define USB_CDC_PKT_LEN      CDC_DATA_SZ
 #define USB_UART_RX_BUF_SIZE (USB_CDC_PKT_LEN * 5)

t5577_multiwriter/t5577_multiwriter_i.h

@@ -8,8 +8,7 @@
 #include <assets_icons.h>
 #include <gui/view_dispatcher.h>
 #include <gui/scene_manager.h>
-#include <toolbox/cli/cli_command.h>
-#include <cli/cli_main_commands.h>
+#include <cli/cli.h>
 #include <notification/notification_messages.h>
 
 #include <gui/modules/submenu.h>