aboutsummaryrefslogtreecommitdiff
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:09:43 +0000
commitff37ad963b479bb1052332b20c0c375a279f57a4 (patch)
tree4fdfd7e72575313f86026ffa7dc40a84c7b614dd
parent62d7440fde064f7f80853050be182b870fedb282 (diff)
kanata: corrige bug na configuracao
-rw-r--r--kanata/akko.kbd8
1 files changed, 8 insertions, 0 deletions
diff --git a/kanata/akko.kbd b/kanata/akko.kbd
index 6f2ce90..45ed739 100644
--- a/kanata/akko.kbd
+++ b/kanata/akko.kbd
@@ -150,7 +150,15 @@
(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 _ _
_ _ _ _ _ _
)