diff options
author | John MacFarlane <jgm@berkeley.edu> | 2017-02-20 20:52:00 +0100 |
---|---|---|
committer | John MacFarlane <jgm@berkeley.edu> | 2017-02-20 20:52:00 +0100 |
commit | ce8226f1a7d64da56117d2f7f351e06225a84614 (patch) | |
tree | 9f2d716df0230f5f17372f19b8718dcf86039fd9 /src/Text/Pandoc/Compat/Time.hs | |
parent | e86e44b98e592d5a5e4c6b43d9b57b195f091ed9 (diff) | |
parent | 12d96508c62189b4ff8c8b797d34cc9ef177f5ee (diff) | |
download | pandoc-ce8226f1a7d64da56117d2f7f351e06225a84614.tar.gz |
Merge commit '9e52ac6bb02afd7b4ed5dad61021a1fa33051203' as 'data/templates'
Diffstat (limited to 'src/Text/Pandoc/Compat/Time.hs')
-rw-r--r-- | src/Text/Pandoc/Compat/Time.hs | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/src/Text/Pandoc/Compat/Time.hs b/src/Text/Pandoc/Compat/Time.hs deleted file mode 100644 index b1cde82a4..000000000 --- a/src/Text/Pandoc/Compat/Time.hs +++ /dev/null @@ -1,30 +0,0 @@ -{-# LANGUAGE CPP #-} - -{- -This compatibility module is needed because, in time 1.5, the -`defaultTimeLocale` function was moved from System.Locale (in the -old-locale library) into Data.Time. - -We support both behaviors because time 1.4 is a boot library for GHC -7.8. time 1.5 is a boot library for GHC 7.10. - -When support is dropped for GHC 7.8, this module may be obsoleted. --} - -#if MIN_VERSION_time(1,5,0) -module Text.Pandoc.Compat.Time ( - module Data.Time -) -where -import Data.Time - -#else -module Text.Pandoc.Compat.Time ( - module Data.Time, - defaultTimeLocale -) -where -import Data.Time -import System.Locale ( defaultTimeLocale ) - -#endif |