Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixing some rules; conflicts and misc #83

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixing some rules; conflicts and misc #83

wants to merge 3 commits into from

Commits on May 15, 2015

  1. Close brackets and fix comments containg " 

    When trying the aproximately equal to; it resulted in:

≅"	U245	# APROXIMATELY EQUAL TO (It actualy means "congruent

This should fix it.

This also closes brackets on the INVERTED INTERROBANG, it bothered me.
    Tibo authored and Tibo committed May 15, 2015
    Configuration menu
    Copy the full SHA
    0767ed4 View commit details
    Browse the repository at this point in the history

  2. Fix some conflicts 

    Fixes these conflicts:


<Multi_key> <underscore> <asciicircum>  conflicted with <Multi_key> <underscore> <asciicircum> <underscore>
<Multi_key> <plus> <plus>               conflicted with <Multi_key> <plus> <plus> <less>
<Multi_key> <plus> <plus>               conflicted with <Multi_key> <plus> <plus> <greater>
<Multi_key> <parenleft> <minus>         conflicted with <Multi_key> <parenleft> <minus> <parenright>
<Multi_key> <equal> <d>                 conflicted with <Multi_key> <equal> <d> <e> <f>
<Multi_key> <c> <period>                conflicted with <Multi_key> <c> <period> <period>
<Multi_key> <less> <e>                  conflicted with <Multi_key> <less> <e> <h>
<Multi_key> <less> <e>                  conflicted with <Multi_key> <less> <e> <r>
<Multi_key> <o> <minus>                 conflicted with <Multi_key> <o> <minus> <plus>
<Multi_key> <o> <minus>                 conflicted with <Multi_key> <o> <minus> <greater>
<Multi_key> <exclam> <i>                conflicted with <Multi_key> <exclam> <i> <n>
<Multi_key> <less> <minus>              conflicted with <Multi_key> <less> <minus> <greater>
<Multi_key> <less> <minus>              conflicted with <Multi_key> <less> <minus> <equal> <greater>
    Tibo authored and Tibo committed May 15, 2015
    Configuration menu
    Copy the full SHA
    ae2efba View commit details
    Browse the repository at this point in the history

  3. Fixes more conflicts 

    <Multi_key> <grave> <grave>             conflicted with <Multi_key> <grave> <grave> <Cyrillic_a>
<Multi_key> <grave> <grave>             conflicted with <Multi_key> <grave> <grave> <Cyrillic_A>
<Multi_key> <grave> <grave>             conflicted with <Multi_key> <grave> <grave> <Cyrillic_ie>
<Multi_key> <grave> <grave>             conflicted with <Multi_key> <grave> <grave> <Cyrillic_IE>
<Multi_key> <grave> <grave>             conflicted with <Multi_key> <grave> <grave> <Cyrillic_i>
<Multi_key> <grave> <grave>             conflicted with <Multi_key> <grave> <grave> <Cyrillic_I>
<Multi_key> <grave> <grave>             conflicted with <Multi_key> <grave> <grave> <Cyrillic_o>
<Multi_key> <grave> <grave>             conflicted with <Multi_key> <grave> <grave> <Cyrillic_O>
<Multi_key> <grave> <grave>             conflicted with <Multi_key> <grave> <grave> <Cyrillic_u>
<Multi_key> <grave> <grave>             conflicted with <Multi_key> <grave> <grave> <Cyrillic_U>
<Multi_key> <grave> <grave>             conflicted with <Multi_key> <grave> <grave> <Cyrillic_er>
<Multi_key> <grave> <grave>             conflicted with <Multi_key> <grave> <grave> <Cyrillic_ER>
<Multi_key> <asterisk> <apostrophe>     conflicted with <Multi_key> <asterisk> <apostrophe> <A>
<Multi_key> <asterisk> <apostrophe>     conflicted with <Multi_key> <asterisk> <apostrophe> <a>
<Multi_key> <backslash> <o>             conflicted with <Multi_key> <backslash> <o> <slash>

Maybe undo/replace something:
<Multi_key> <Up> <Up>                   conflicted with <Multi_key> <Up> <Up> <Down> <Down> <Left> <Right> <Left> <Right> <b> <a>
    Tibo authored and Tibo committed May 15, 2015
    Configuration menu
    Copy the full SHA
    38856e6 View commit details
    Browse the repository at this point in the history