diff options
| author | ickc <ickc@users.noreply.github.com> | 2016-05-09 19:24:40 -0700 |
|---|---|---|
| committer | ickc <ickc@users.noreply.github.com> | 2016-05-09 19:24:40 -0700 |
| commit | 0ae60a91535a8f55f3061f36fdb3a54f6ddda85d (patch) | |
| tree | f0c74ae411967ed5f67bd8b0bdf175ee5ca964ab /src/Text/Pandoc/Parsing.hs | |
| parent | 846fa8704618e7e544313f5b3b627ccb6e65b550 (diff) | |
| parent | f7601297f0ff184a59efdc3ea279137fc6012eef (diff) | |
| download | pandoc-0ae60a91535a8f55f3061f36fdb3a54f6ddda85d.tar.gz | |
Merge pull request #1 from jgm/master
Merge from jgm's master
Diffstat (limited to 'src/Text/Pandoc/Parsing.hs')
| -rw-r--r-- | src/Text/Pandoc/Parsing.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Text/Pandoc/Parsing.hs b/src/Text/Pandoc/Parsing.hs index 325231846..7bf827019 100644 --- a/src/Text/Pandoc/Parsing.hs +++ b/src/Text/Pandoc/Parsing.hs @@ -5,7 +5,7 @@ , MultiParamTypeClasses , FlexibleInstances #-} {- -Copyright (C) 2006-2015 John MacFarlane <jgm@berkeley.edu> +Copyright (C) 2006-2016 John MacFarlane <jgm@berkeley.edu> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA {- | Module : Text.Pandoc.Parsing - Copyright : Copyright (C) 2006-2015 John MacFarlane + Copyright : Copyright (C) 2006-2016 John MacFarlane License : GNU GPL, version 2 or above Maintainer : John MacFarlane <jgm@berkeley.edu> |