From 909c945e02ecc07b15ab2f41595bb2ec2ad97abc Mon Sep 17 00:00:00 2001 From: msozeau Date: Thu, 5 May 2011 12:09:27 +0000 Subject: Fix merge, Cumul moved to CUMUL git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@14093 85f007b7-540e-0410-9357-904b9bb8a0f7 --- pretyping/unification.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pretyping/unification.ml b/pretyping/unification.ml index c76055d4f7..9e1ccd0260 100644 --- a/pretyping/unification.ml +++ b/pretyping/unification.ml @@ -631,7 +631,7 @@ let unify_to_type env sigma flags c status u = let c = refresh_universes c in let t = get_type_of env sigma c in let t = nf_betaiota sigma (nf_meta sigma t) in - unify_0 env sigma Cumul flags t u + unify_0 env sigma CUMUL flags t u let unify_type env sigma flags mv status c = let mvty = Typing.meta_type sigma mv in -- cgit v1.2.3