From ff0abce451e73c5911602ac4cfb672f64635fa08 Mon Sep 17 00:00:00 2001
From: Edward Tjörnhammar <ed@cflags.cc>
Date: Tue, 14 Apr 2015 17:28:56 +0200
Subject: De-ambiguify TimeLocale when DateZone is enabled

---
 src/Plugins/DateZone.hs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/Plugins/DateZone.hs')

diff --git a/src/Plugins/DateZone.hs b/src/Plugins/DateZone.hs
index f1737fb..401e77c 100644
--- a/src/Plugins/DateZone.hs
+++ b/src/Plugins/DateZone.hs
@@ -31,12 +31,14 @@ import Control.Concurrent.STM
 import System.IO.Unsafe
 
 import Localize
-import Data.Time.LocalTime
 import Data.Time.Format
+import Data.Time.LocalTime
 import Data.Time.LocalTime.TimeZone.Olson
 import Data.Time.LocalTime.TimeZone.Series
 
+#if ! MIN_VERSION_time(1,5,0)
 import System.Locale (TimeLocale)
+#endif
 #else
 import System.IO
 import Plugins.Date
-- 
cgit v1.2.3