summaryrefslogtreecommitdiff
path: root/typing/typeclass.mli
diff options
context:
space:
mode:
authorAlain Frisch <alain@frisch.fr>2013-07-16 13:34:30 +0000
committerAlain Frisch <alain@frisch.fr>2013-07-16 13:34:30 +0000
commit525ef9d7035faa15f872af802f2998cd696977e2 (patch)
tree5cb30917030b0a391f87b9b10f8a02ecd55a6575 /typing/typeclass.mli
parentc92858209261d1736a046485b682f20ec459c14b (diff)
parent7334bb026a0d75d53e077cd400d44019f688c7e6 (diff)
downloadocaml-525ef9d7035faa15f872af802f2998cd696977e2.tar.gz
Synchronize with trunk.
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/extension_points@13897 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'typing/typeclass.mli')
-rw-r--r--typing/typeclass.mli1
1 files changed, 1 insertions, 0 deletions
diff --git a/typing/typeclass.mli b/typing/typeclass.mli
index 81e56bd1b5..abc8633bc3 100644
--- a/typing/typeclass.mli
+++ b/typing/typeclass.mli
@@ -103,6 +103,7 @@ type error =
| Final_self_clash of (type_expr * type_expr) list
| Mutability_mismatch of string * mutable_flag
| No_overriding of string * string
+ | Duplicate of string * string
| Extension of string
exception Error of Location.t * Env.t * error