summaryrefslogtreecommitdiff
path: root/quantum/keymap_extras/keymap_spanish_dvorak.h
diff options
context:
space:
mode:
Diffstat (limited to 'quantum/keymap_extras/keymap_spanish_dvorak.h')
-rw-r--r--quantum/keymap_extras/keymap_spanish_dvorak.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/quantum/keymap_extras/keymap_spanish_dvorak.h b/quantum/keymap_extras/keymap_spanish_dvorak.h
index 29c4f1c44a..663be395e9 100644
--- a/quantum/keymap_extras/keymap_spanish_dvorak.h
+++ b/quantum/keymap_extras/keymap_spanish_dvorak.h
@@ -119,7 +119,11 @@
#define DV_CIRC S(DV_GRV) // ^ (dead)
#define DV_ASTR S(DV_PLUS) // *
// Row 3
+<<<<<<< HEAD
+#define DV_DIAE S(DV_GRV) // ¨ (dead)
+=======
#define DV_DIAE S(DV_ACUT) // ¨ (dead)
+>>>>>>> 0.12.52~1
// Row 4
#define DV_RABK S(DV_LABK) // >
#define DV_UNDS S(DV_MINS) // _