Closed physikerwelt closed 8 years ago
It says it has conflicts that must be resolved before I can merge it.
Yes. That's the task... otherwise I would have pressed the button by myself.
I think I added all the code, but the pull request has not actually closed. Could you check and make sure I did everything correctly?
EDIT: I undid the commit since it was incorrect.
@physikerwelt For the merge conflicts, how do I choose which one to keep?
For example:
INFIX: { args: [ 'string', ['self'], ['self'] ] },
FUN2sq: { args: [ 'string', 'self', 'self' ] },
<<<<<<< HEAD
FUN1hl: { args: [ 'string', 'any', 'self' ] },
FUN1hf: { args: [ 'string', FontForce, 'self' ] },
FUN2h: { args: [ 'string', 'any', 'self', 'self' ] },
FUN3: { args: [ 'string', 'self', 'self', 'self'] },
INFIXh: { args: [ 'string', 'any', [ 'self' ], [ 'self' ] ] },
=======
>>>>>>> 1322e14ab87fbfcc9cfa9b56cb59a8a5ce399ad7
MATRIX: { args: [ 'string', [ [ [ 'self' ] ] ] ] },
DECLh: { args: [ 'string', FontForce, [ 'self' ] ] }
});
or
<<<<<<< HEAD
"commander": "~2.8.1"
=======
"commander": "~2.9.0"
>>>>>>> 1322e14ab87fbfcc9cfa9b56cb59a8a5ce399ad7
How do I know what to do?
<<<<<<< HEAD
output: '\\mathbb{R}',
=======
output: '\\mathbb {R} ',
>>>>>>> 1322e14ab87fbfcc9cfa9b56cb59a8a5ce399ad7
This seems to be a simple example. I can't actually run the program to test it since the merge conflicts throw errors.
@ClaudeZou can you merge this pull request? This is not trivial since the DRMF code has slightly diverged