aboutsummaryrefslogtreecommitdiff
path: root/proofs
diff options
context:
space:
mode:
authorPierre-Marie Pédrot2016-11-30 22:47:38 +0100
committerPierre-Marie Pédrot2016-11-30 22:47:38 +0100
commitcf8ecf83b5cc52f7ea73dc1d3af59bf03deff688 (patch)
treebd5a6ad80bb09684899fbcc66963d39ae9a9b52a /proofs
parent88b2eb9279bf5f83f27057094de5b696ee9916e3 (diff)
parent3e6fa1cbdc0ec145728089000595b6ea29f37a4c (diff)
Merge branch 'v8.6'
Diffstat (limited to 'proofs')
-rw-r--r--proofs/proof_global.ml2
1 files changed, 1 insertions, 1 deletions
diff --git a/proofs/proof_global.ml b/proofs/proof_global.ml
index 2956d623fd..a2ee622215 100644
--- a/proofs/proof_global.ml
+++ b/proofs/proof_global.ml
@@ -622,7 +622,7 @@ module Bullet = struct
let _ = register_behavior strict
end
- (* Current bullet behavior, controled by the option *)
+ (* Current bullet behavior, controlled by the option *)
let current_behavior = ref Strict.strict
let _ =