添加遗忘的文件default keys

2021-11-23 10:49:11 +08:00 · 2021-11-23 10:49:11 +08:00 · 71ec4568b1
parent 8c0f387c78
commit 71ec4568b1
1 changed files with 0 additions and 5 deletions
--- a/src/xcmd_default_keys.c
+++ b/src/xcmd_default_keys.c
@ -31,13 +31,8 @@ static int xcmd_del_char(void *pv)

 static int xcmd_enter(void *pv)
 {
-<<<<<<< HEAD
    char *cmd = xcmd_end_of_input();
    xcmd_print("\n\r");
-=======
-    char *cmd = xcmd_display_line_end();
-    xcmd_print("   \n\r");
->>>>>>> f787c2a92747d874c5d64eff373c82e048b2876a
    if(cmd[0])
    {
        xcmd_exec(cmd);