summaryrefslogtreecommitdiff
path: root/ocamldoc/odoc_merge.mli
diff options
context:
space:
mode:
authorDamien Doligez <damien.doligez-inria.fr>2002-07-23 14:12:03 +0000
committerDamien Doligez <damien.doligez-inria.fr>2002-07-23 14:12:03 +0000
commit37bf95c248f7f8e9f0f2557224837e530c428e93 (patch)
tree1fe95869eaf97ba5888bb1f2a7163a4d6770d4f3 /ocamldoc/odoc_merge.mli
parent30fdb7585514c6557ad38b87f8bfe079c322edc4 (diff)
downloadocaml-37bf95c248f7f8e9f0f2557224837e530c428e93.tar.gz
detabisation
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5029 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'ocamldoc/odoc_merge.mli')
-rw-r--r--ocamldoc/odoc_merge.mli4
1 files changed, 2 insertions, 2 deletions
diff --git a/ocamldoc/odoc_merge.mli b/ocamldoc/odoc_merge.mli
index 44e89ee614..3dadeecc0a 100644
--- a/ocamldoc/odoc_merge.mli
+++ b/ocamldoc/odoc_merge.mli
@@ -18,8 +18,8 @@
val merge_info_opt :
Odoc_types.merge_option list ->
Odoc_types.info option ->
- Odoc_types.info option ->
- Odoc_types.info option
+ Odoc_types.info option ->
+ Odoc_types.info option
(** Merge of modules which represent the same OCaml module, in a list of t_module.
There must be at most two t_module for the same OCaml module, one for a .mli, another for the .ml.