From: simonm <unknown>
Date: Wed, 28 Apr 1999 08:30:58 +0000 (+0000)
Subject: [project @ 1999-04-28 08:30:58 by simonm]
X-Git-Tag: Approximately_9120_patches~6280
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=e43af6174fa6986e5c85f1384c7e2e5eaff8dc4f;p=ghc-hetmet.git

[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
--- 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