summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2015-04-17 19:21:07 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2015-04-17 19:23:13 -0700
commit764f677530079d85078dfb5d3dd4cd367c905aeb (patch)
tree4aaa8d1767e6165bcafccc8ce95ee5ae57a2cbec /data
parent28ca8566ab72e135d559e457e28d3f3f306a7b0e (diff)
parent9557eb6f8efafaff2e3a61e43e4cc7e4717ad9eb (diff)
Merge branch 'latex-tightlist' of https://github.com/jlduran/pandoc into jlduran-latex-tightlist
Conflicts: data/templates
Diffstat (limited to 'data')
m---------data/templates13
1 files changed, 6 insertions, 7 deletions
diff --git a/data/templates b/data/templates
-Subproject e8aec53fad6b4d587a44af5ca76c4b809569f15
+Subproject d248c9d6382ded310564424bf110cdf159785fa