[commit: packages/containers] develop, develop-0.6, develop-0.6-questionable, master, zip-devel: Merge language pragmas (bae098f)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/containers

On branches: develop,develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/bae098fb0a3994bc2b0ec3313004b40cd097ed8d

>---------------------------------------------------------------

commit bae098fb0a3994bc2b0ec3313004b40cd097ed8d
Merge: 0098d41 0e99ba8
Author: Johan Tibell <johan.tibell at gmail.com>
Date:   Mon Apr 14 08:20:44 2014 +0200

    Merge language pragmas



>---------------------------------------------------------------

bae098fb0a3994bc2b0ec3313004b40cd097ed8d
 Data/IntMap/Base.hs | 16 +++++++++++++++-
 Data/IntSet/Base.hs | 13 +++++++++++++
 Data/Map/Base.hs    | 11 +++++++++++
 Data/Set/Base.hs    | 11 +++++++++++
 4 files changed, 50 insertions(+), 1 deletion(-)

diff --cc Data/Map/Base.hs
index 95f7b91,69f8276..db9549f
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@@ -6,7 -6,7 +6,8 @@@
  {-# LANGUAGE Trustworthy #-}
  #endif
  #if __GLASGOW_HASKELL__ >= 708
 +{-# LANGUAGE RoleAnnotations #-}
+ {-# LANGUAGE TypeFamilies #-}
  #endif
  -----------------------------------------------------------------------------
  -- |
diff --cc Data/Set/Base.hs
index da3b21d,94372df..ffcdfd0
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@@ -6,7 -6,7 +6,8 @@@
  {-# LANGUAGE Trustworthy #-}
  #endif
  #if __GLASGOW_HASKELL__ >= 708
 +{-# LANGUAGE RoleAnnotations #-}
+ {-# LANGUAGE TypeFamilies #-}
  #endif
  -----------------------------------------------------------------------------
  -- |