fix conflicts

sympy · Sep 1, 2020 · fad04fe · fad04fe
1 parent aa01508
commit fad04fe
Show file tree

Hide file tree

Showing 7 changed files with 500 additions and 5,231 deletions.
diff --git a/sympy/parsing/latex/.antlr/LaTeX.interp b/sympy/parsing/latex/.antlr/LaTeX.interp
diff --git a/sympy/parsing/latex/.antlr/LaTeX.tokens b/sympy/parsing/latex/.antlr/LaTeX.tokens