aboutsummaryrefslogtreecommitdiff
path: root/kanata
diff options
context:
space:
mode:
authorGravatar pinoinha <pinoinha@disroot.org> 2024-03-28 18:09:43 +0000
committerGravatar pinoinha <pinoinha@disroot.org> 2024-03-28 18:20:01 +0000
commitf9d1ee628d3e36931ef6a93e15b740f5d1871f4b (patch)
treeb11213ced367da572abeb6b95286d7634f761fec /kanata
parentff37ad963b479bb1052332b20c0c375a279f57a4 (diff)
kanata: corrige bug na configuracao
Diffstat (limited to 'kanata')
-rw-r--r--kanata/akko.kbd8
1 files changed, 0 insertions, 8 deletions
diff --git a/kanata/akko.kbd b/kanata/akko.kbd
index 45ed739..ffbf9ab 100644
--- a/kanata/akko.kbd
+++ b/kanata/akko.kbd
@@ -150,15 +150,7 @@
(deflayer num
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _
_ _ _ _ _ _ _ 7 8 9 _ _ _ _
-<<<<<<< Updated upstream
- _ _ @lalt @lctl @lshft _ _ 4 5 6 _ _ _
-=======
-<<<<<<< Updated upstream
- _ _ @lalt @lctl @lshft _ _ 4 5 6 _ _ _
-=======
_ _ @lalt @lctl @lsft _ _ 4 5 6 _ _ _
->>>>>>> Stashed changes
->>>>>>> Stashed changes
_ _ _ _ @lmet _ 0 1 2 3 _ _
_ _ _ _ _ _
)