diff options
| author | Nicolas Frisby <nicolas.frisby@gmail.com> | 2014-08-19 20:03:23 -0500 |
|---|---|---|
| committer | Nicolas Frisby <nicolas.frisby@gmail.com> | 2014-08-19 20:04:15 -0500 |
| commit | f17ceee98221de21f896ac412b7a7ddcfc35a0c6 (patch) | |
| tree | 3b3237251bee546221b9023b9c7cf0a94bc7d37a /compiler/types/Type.lhs-boot | |
| parent | 4d3f37e0c07f35be51b8bb24374ca3163b8b9a46 (diff) | |
| parent | 15faa0ec3a5a783f3949dcff6adf412d5f21bdf8 (diff) | |
| download | haskell-f17ceee98221de21f896ac412b7a7ddcfc35a0c6.tar.gz | |
Merge branch 'master' into late-lam-lift
Silly conflicts because of new flags -- not sure how best to resolve/avoid this.
git is requiring my commit to mention 'submodule' for some reason?
Conflicts:
compiler/main/DynFlags.hs
Diffstat (limited to 'compiler/types/Type.lhs-boot')
| -rw-r--r-- | compiler/types/Type.lhs-boot | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/compiler/types/Type.lhs-boot b/compiler/types/Type.lhs-boot index c2d2dec093..ff9db3e28c 100644 --- a/compiler/types/Type.lhs-boot +++ b/compiler/types/Type.lhs-boot @@ -3,7 +3,6 @@ module Type where import {-# SOURCE #-} TypeRep( Type, Kind ) import Var -noParenPred :: Type -> Bool isPredTy :: Type -> Bool typeKind :: Type -> Kind |