Fix merge conflict
--HG--
branch : dev
1 parent 1e164fd commit 087cd21860e438f321b2296142b2f2a67914bf89
@yuuji@gentei.org yuuji@gentei.org authored on 17 Dec 2011
Showing 3 changed files
View
yahtml.el
View
yatex.el
View
yatexmth.el