crlane/WordToLaTeX — comment on commit 5f51dffaa84e71eafc623dacaf433733deb9054e
File:  line 0
By crlane:

removed merge conflicts