diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2019-11-07 10:48:38 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2019-11-07 10:48:38 -0800 |
| commit | 9c7f75afb5d4e50ac915213eba0470c2d0ad304d (patch) | |
| tree | e6c9e0e66d8cd9458ccaf2104abfb22946652bf5 /stack.yaml | |
| parent | e299212bf766cdbeec43be90f634038ab4a727c1 (diff) | |
Change merge behavior for metadata.
Previously, if a document contained two YAML metadata blocks
that set the same field, the conflict would be resolved in favor
of the first. Now it is resolved in favor of the second (due to
a change in pandoc-types).
This makes the behavior more uniform with other things in pandoc
(such as reference links and `--metadata-file`).
Diffstat (limited to 'stack.yaml')
| -rw-r--r-- | stack.yaml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/stack.yaml b/stack.yaml index e85d101f6..0989fbed1 100644 --- a/stack.yaml +++ b/stack.yaml @@ -13,7 +13,7 @@ packages: - '.' extra-deps: - pandoc-citeproc-0.16.3.1 -- pandoc-types-1.17.6.1 +#- pandoc-types-1.17.6.1 - texmath-0.11.3 - haddock-library-1.8.0 - skylighting-0.8.2.3 @@ -23,6 +23,8 @@ extra-deps: - HsYAML-0.2.0.0 - HsYAML-aeson-0.2.0.0 - doctemplates-0.7 +- git: https://github.com/jgm/pandoc-types + commit: 00f7bb79e79d7cfd3523880dbc64ba3ea46c3da2 ghc-options: "$locals": -fhide-source-paths -Wno-missing-home-modules resolver: lts-14.6 |