From 5b493656bb609a82bfbbc825ef5bc26044314e05 Mon Sep 17 00:00:00 2001 From: Thanos Apollo Date: Tue, 21 Mar 2023 10:52:55 +0200 Subject: stumpwm: fix rebase error --- .config/stumpwm/keybindings.lisp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to '.config/stumpwm') diff --git a/.config/stumpwm/keybindings.lisp b/.config/stumpwm/keybindings.lisp index 12581d6..c12e239 100644 --- a/.config/stumpwm/keybindings.lisp +++ b/.config/stumpwm/keybindings.lisp @@ -40,13 +40,11 @@ ;;Keyboard-light (define-key *top-map* (kbd "XF86Explorer") "exec brightnessctl --device='tpacpi::kbd_backlight' set +1") (define-key *top-map* (kbd "XF86LaunchA") "exec brightnessctl --device='tpacpi::kbd_backlight' set 1-") -<<<<<<< HEAD -======= ;; Keyboard layout (define-key *top-map* (kbd "F1") "exec setxkbmap us") (define-key *top-map* (kbd "F2") "exec setxkbmap gr") ->>>>>>> d570427 (stumpwm: For keys add gr and us layout switches) + ;;; Groups ;; Switch to group -- cgit v1.2.3