From e43af6174fa6986e5c85f1384c7e2e5eaff8dc4f Mon Sep 17 00:00:00 2001
From: simonm <unknown>
Date: Wed, 28 Apr 1999 08:30:58 +0000
Subject: [PATCH] [project @ 1999-04-28 08:30:58 by simonm] merge --> mergeIO

---
 ghc/lib/concurrent/Merge.lhs |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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