diff options
author | Pritam Baral <pritam@pritambaral.com> | 2020-06-11 04:02:27 +0000 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2020-06-11 04:02:27 +0000 |
commit | c8d68304c826567f27f5a913dd38f6e045b81483 (patch) | |
tree | 73ebac117b2e28d43f073285308bfeb14342d5ac /symbols/in | |
parent | 8dfdf87b7a7e329c97f7891f39ef1d9adf1c6782 (diff) |
Fix symbols/in syntax error: spurious git conflict marker
Introduced in https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/93ea944c2599584a4dd1add1725fafd19fef2535#904fcb1a2ae93630fa2905a7fd0ced3f8e50a6e8_2329_2329
Diffstat (limited to 'symbols/in')
-rw-r--r-- | symbols/in | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2326,7 +2326,7 @@ xkb_symbols "marathi" { key <AB09> { [ period, U0964, U0965, U093d ] }; key <AB10> { [ U092f, question, slash, question ] }; }; -======= + // EXTRAS: // Modi is an ancient Indian script that is used to write texts in Marathi, Hindi and Sanskrit. |