diff options
author | Stephane Glondu <steph@glondu.net> | 2013-05-08 17:47:16 +0200 |
---|---|---|
committer | Stephane Glondu <steph@glondu.net> | 2013-05-08 17:47:16 +0200 |
commit | 813d651c75cb954677a483b60d880600b421e011 (patch) | |
tree | f917021e7e7083cf1ce84f9a560179603f0c7af6 /kernel/modops.ml | |
parent | 0c6687c12b628881d5660d57707f0e7ca9e521b7 (diff) | |
parent | 499a11a45b5711d4eaabe84a80f0ad3ae539d500 (diff) |
Merge tag 'upstream/8.4pl2dfsg' into experimental/master
Upstream version 8.4pl2dfsg
Diffstat (limited to 'kernel/modops.ml')
-rw-r--r-- | kernel/modops.ml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/modops.ml b/kernel/modops.ml index af32288c..a81f868e 100644 --- a/kernel/modops.ml +++ b/kernel/modops.ml @@ -33,7 +33,7 @@ type signature_mismatch_error = | NotConvertibleInductiveField of identifier | NotConvertibleConstructorField of identifier | NotConvertibleBodyField - | NotConvertibleTypeField + | NotConvertibleTypeField of env * types * types | NotSameConstructorNamesField | NotSameInductiveNameInBlockField | FiniteInductiveFieldExpected of bool |