diff options
| author | Pierre Boutillier | 2015-06-22 11:49:58 +0200 |
|---|---|---|
| committer | Pierre Boutillier | 2015-06-22 11:49:58 +0200 |
| commit | 6bec099f8487b9d3ec5c44079cf69d3474c73b91 (patch) | |
| tree | b23d8983fa887cc7e7255df455c64d5d54130787 /parsing | |
| parent | 07e8eede6670a256a81d9d70133ebbeb64f45fe3 (diff) | |
| parent | 949d027ce8fa94b5c62f938b58c3f85d015b177b (diff) | |
Merge remote-tracking branch 'forge/v8.5'
Diffstat (limited to 'parsing')
| -rw-r--r-- | parsing/g_vernac.ml4 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/parsing/g_vernac.ml4 b/parsing/g_vernac.ml4 index 09059b410e..e8a1b512c0 100644 --- a/parsing/g_vernac.ml4 +++ b/parsing/g_vernac.ml4 @@ -249,7 +249,8 @@ GEXTEND Gram [ [ IDENT "Hypotheses" -> (Some Discharge, Logical) | IDENT "Variables" -> (Some Discharge, Definitional) | IDENT "Axioms" -> (None, Logical) - | IDENT "Parameters" -> (None, Definitional) ] ] + | IDENT "Parameters" -> (None, Definitional) + | IDENT "Conjectures" -> (None, Conjectural) ] ] ; inline: [ [ IDENT "Inline"; "("; i = INT; ")" -> InlineAt (int_of_string i) |