[resolve conflict between Subst.merge qualification and ForallT parameter change
Helmut Grohne <grohne@cs.uni-bonn.de>**20150316115241
 Ignore-this: 837047792e730296dcf9869f1a57a435
] hunk ./src/Syntax/UnifyTy.hs 44
-    match t (VarT n)                 = return $ n <~ t
-    match t (ForallT _ c (VarT n))   = check (n <~ t) c >> return (n <~ t)
-    match t (ForallT _ c (AppT l r)) = match t (AppT (quantify l c)(quantify r c))
-    match (ForallT _ c (AppT l r)) t = match (AppT (quantify l c)(quantify r c)) t
-    match (AppT l r)(AppT l' r')     = do sl <- match l l'
-                                          sr <- match r r'
-                                          merge sl sr
+    match t (VarT n)               = return $ n <~ t
+    match t (ForallT c (VarT n))   = check (n <~ t) c >> return (n <~ t)
+    match t (ForallT c (AppT l r)) = match t (AppT (quantify l c) (quantify r c))
+    match (ForallT c (AppT l r)) t = match (AppT (quantify l c) (quantify r c)) t
+    match (AppT l r) (AppT l' r')  = do sl <- match l l'
+                                        sr <- match r r'
+                                        Subst.merge sl sr
