Fix conflicts

This commit is contained in:
DizzyEggg committed 2018-12-07 23:01:14 +01:00
commit 470df386c9
411 files changed
+25761 -23302

No files matched your search

+1 -1
View File
@@ -80,7 +80,7 @@ RIGHT_ARROW = 7C
'“' = B1
'”' = B2
'‘' = B3
'’' = B4
'\'' = B4
'♂' = B5
'♀' = B6
'¥' = B7