fix: 冲突处理

alisonjoe · May 25, 2024 · f41a3dd · f41a3dd
1 parent 5eb4b59
commit f41a3dd
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/lisp/init-editing-utils.el b/lisp/init-editing-utils.el
@@ -198,7 +198,6 @@
 (global-set-key [M-down] 'md-move-lines-down)
 (global-set-key [M-S-up] 'md-move-lines-up)
 (global-set-key [M-S-down] 'md-move-lines-down)
->>>>>>> 099bac07 (feat: add personal config)
 
 (global-set-key (kbd "C-c d") 'md-duplicate-down)
 (global-set-key (kbd "C-c u") 'md-duplicate-up)