diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2015-03-28 12:12:48 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2015-03-28 12:12:48 -0700 |
| commit | 6a3a04c4280817df39519bf1d73eee3b9e0b3841 (patch) | |
| tree | 304a696d66d3d8cfb6f1441086947c12f2cb1cb8 /data/docx/docProps/app.xml | |
| parent | d744b83b61bc635419339b73b687b9280ee757fc (diff) | |
| parent | ad39bc7009e320b3afb91a5683521eb1eccf0ef7 (diff) | |
Merge branch 'errortype' of https://github.com/mpickering/pandoc into mpickering-errortype
Conflicts:
benchmark/benchmark-pandoc.hs
src/Text/Pandoc/Readers/Markdown.hs
src/Text/Pandoc/Readers/Org.hs
src/Text/Pandoc/Readers/RST.hs
tests/Tests/Readers/LaTeX.hs
Diffstat (limited to 'data/docx/docProps/app.xml')
0 files changed, 0 insertions, 0 deletions