diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2012-07-04 13:19:26 +0100 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2012-07-04 13:19:47 +0100 |
| commit | 3f0afabaf3e862d986279dc041b14b61e73f86d3 (patch) | |
| tree | 30b0a2dabcdbf01688040ea28128292970dc4085 /compiler/utils | |
| parent | 99fd2469fba1a38b2a65b4694f337d92e559df01 (diff) | |
| download | haskell-3f0afabaf3e862d986279dc041b14b61e73f86d3.tar.gz | |
Fix merge-related problems
Diffstat (limited to 'compiler/utils')
| -rw-r--r-- | compiler/utils/Outputable.lhs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/compiler/utils/Outputable.lhs b/compiler/utils/Outputable.lhs index 7ffce77a47..93dfd33606 100644 --- a/compiler/utils/Outputable.lhs +++ b/compiler/utils/Outputable.lhs @@ -699,8 +699,6 @@ instance (Outputable key, Outputable elt) => Outputable (M.Map key elt) where ppr m = ppr (M.toList m) instance (Outputable elt) => Outputable (IM.IntMap elt) where ppr m = ppr (IM.toList m) -instance (PlatformOutputable elt) => PlatformOutputable (Set.Set elt) where - pprPlatform platform m = pprPlatform platform (Set.toList m) \end{code} %************************************************************************ |