SPJ's fix to resolve conflict in instFun
authorManuel M T Chakravarty <chak@cse.unsw.edu.au>
Wed, 20 Sep 2006 18:52:40 +0000 (18:52 +0000)
committerManuel M T Chakravarty <chak@cse.unsw.edu.au>
Wed, 20 Sep 2006 18:52:40 +0000 (18:52 +0000)
commitdefa8d16860add244593aa1430866e090d4b8cf0
tree66ae8b58815d35be75b9256ea7a25e3e35b8b8d4
parent27ca67931713c36f5ed248de88298416892e5649
SPJ's fix to resolve conflict in instFun
Wed Sep 20 02:27:26 EDT 2006  Manuel M T Chakravarty <chak@cse.unsw.edu.au>
  * SPJ's fix to resolve conflict in instFun
compiler/typecheck/TcExpr.lhs