[project @ 1999-04-28 08:30:58 by simonm]

merge --> mergeIO

diff --git a/ghc/lib/concurrent/Merge.lhs b/ghc/lib/concurrent/Merge.lhs
index 22165bd..395bd2f 100644 (file)
--- a/ghc/lib/concurrent/Merge.lhs
+++ b/ghc/lib/concurrent/Merge.lhs
@@ -11,7 +11,7 @@ IO monad.
 \begin{code}
 module Merge
        (
-         merge
+         mergeIO
        , nmergeIO
        ) where