summaryrefslogtreecommitdiffstats
path: root/default.opendocument
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2020-01-20 09:02:40 -0800
committerGitHub <noreply@github.com>2020-01-20 09:02:40 -0800
commit21a78318e309235cec8ef0f732e01c97255eb588 (patch)
treefd353507acfdc5d3bb2cbde17c12ad67a7bd99c6 /default.opendocument
parent4a42969a53987afeadecb63214d188fe1c149459 (diff)
parent7933817371f5bdd17cf34584b896840355a759ac (diff)
downloadpandoc-templates-21a78318e309235cec8ef0f732e01c97255eb588.tar.gz
pandoc-templates-21a78318e309235cec8ef0f732e01c97255eb588.zip
Merge pull request #9 from Silex/master
Remove latex conflict files
Diffstat (limited to 'default.opendocument')
0 files changed, 0 insertions, 0 deletions