Fix a previous incorrect merge.
authorJose Pedro Magalhaes <jpm@cs.uu.nl>
Thu, 5 May 2011 07:44:43 +0000 (09:44 +0200)
committerJose Pedro Magalhaes <jpm@cs.uu.nl>
Thu, 5 May 2011 07:44:43 +0000 (09:44 +0200)
commit0d3a6d5371e6f7a739a9b03ece6d72eb8a3803c7
tree2a41a01d3d0d765d55b942dd41433f8497cb90c5
parentea94a66d93047a9b0cd4532645eb1e9be04888e1
Fix a previous incorrect merge.
compiler/typecheck/TcSMonad.lhs