Fix vscode's fumbled merge conflicts

This commit is contained in:
Willy-JL
2024-07-15 23:08:42 +01:00
parent 3852dd430f
commit 33896ef98f
2 changed files with 2 additions and 15 deletions

View File

@@ -178,16 +178,6 @@ void cli_command_src(Cli* cli, FuriString* args, void* context) {
printf("https://github.com/Next-Flip/Momentum-Firmware");
}
void cli_command_src(Cli* cli, FuriString* args, void* context) {
// Quality of life feature for people exploring CLI on lab.flipper.net/cli
// By Yousef AK
UNUSED(cli);
UNUSED(args);
UNUSED(context);
printf("https://github.com/Next-Flip/Momentum-Firmware");
}
#define CLI_COMMAND_LOG_RING_SIZE 2048
#define CLI_COMMAND_LOG_BUFFER_SIZE 64