diff options
| author |  Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> | 2016-11-30 22:47:38 +0100 |
|---|---|---|
| committer | Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> | 2016-11-30 22:47:38 +0100 |
| commit | cf8ecf83b5cc52f7ea73dc1d3af59bf03deff688 (patch) | |
| tree | bd5a6ad80bb09684899fbcc66963d39ae9a9b52a /dev | |
| parent | 88b2eb9279bf5f83f27057094de5b696ee9916e3 (diff) | |
| parent | 3e6fa1cbdc0ec145728089000595b6ea29f37a4c (diff) | |
Merge branch 'v8.6'
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/doc/notes-on-conversion | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dev/doc/notes-on-conversion b/dev/doc/notes-on-conversion index 6274275c9..a81f170c6 100644 --- a/dev/doc/notes-on-conversion +++ b/dev/doc/notes-on-conversion @@ -21,7 +21,7 @@ Notation OMEGA := (ack 4 4). Definition f (x:nat) := x. -(* Evaluation in tactics can somehow be controled *) +(* Evaluation in tactics can somehow be controlled *) Lemma l1 : OMEGA = OMEGA. reflexivity. (* succeed: identity *) Qed. (* succeed: identity *) |