Merge remote-tracking branch 'upstream/master' into interactive-shell-syntax

2015-12-20 13:55:22 +03:00
parent ddfcd6c281 2988749b84
commit 1c45404f74
11 changed files with 55 additions and 79 deletions
--- a/src/GHCMod/Options/DocUtils.hs
+++ b/src/GHCMod/Options/DocUtils.hs
@@ -23,7 +23,8 @@ module GHCMod.Options.DocUtils (
 ) where

 import Options.Applicative
-import Data.Monoid (Monoid) -- for ghc<7.10
+import Data.Monoid
+import Prelude

 infixl 6 <||>
 infixr 7 <$$>