diff options
| author | msozeau | 2012-03-14 13:33:12 +0000 |
|---|---|---|
| committer | msozeau | 2012-03-14 13:33:12 +0000 |
| commit | e193bc26b8dcd2c24b68054f6d4ab8e5986d357c (patch) | |
| tree | 169a876fa38b3c61b03692f084316866b09719ca /pretyping | |
| parent | 585d45c78a8b86e0aba21151828a78e9c7259f0d (diff) | |
Fix merge and add missing file.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@15040 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'pretyping')
| -rw-r--r-- | pretyping/pretyping.ml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/pretyping/pretyping.ml b/pretyping/pretyping.ml index 08eaa88673..a9581e8bab 100644 --- a/pretyping/pretyping.ml +++ b/pretyping/pretyping.ml @@ -138,7 +138,6 @@ let solve_remaining_evars fail_evar use_classes hook env initial_sigma (evd,c) = (* Side-effect *) !evdref,c -<<<<<<< HEAD (* Allow references to syntaxically inexistent variables (i.e., if applied on an inductive) *) let allow_anonymous_refs = ref false |