diff options
author | Thanos Apollo <[email protected]> | 2023-03-21 10:52:55 +0200 |
---|---|---|
committer | Thanos Apollo <[email protected]> | 2023-03-21 10:52:55 +0200 |
commit | 5b493656bb609a82bfbbc825ef5bc26044314e05 (patch) | |
tree | 6404f8549de5f6389418f8a3db6dc2751cd0df65 /.config/stumpwm/keybindings.lisp | |
parent | b6cfa1a59d77d35f5194781f36a32e0f92d566ae (diff) |
stumpwm: fix rebase error
Diffstat (limited to '.config/stumpwm/keybindings.lisp')
-rw-r--r-- | .config/stumpwm/keybindings.lisp | 4 |
1 files changed, 1 insertions, 3 deletions
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 |