Resolve conflicts in bytecomp and file_formats mlis

ocaml-flambda · Oct 19, 2023 · 7af50ad · 7af50ad
1 parent e4c6ddd
commit 7af50ad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/bytecomp/bytelink.mli b/bytecomp/bytelink.mli
@@ -17,7 +17,7 @@ open Misc
 
 (* Link .cmo files and produce a bytecode executable. *)
 
-module Dep : Set.OrderedType with type t = modname * modname
+module Dep : Set.OrderedType with type t = string * string
 module DepSet : Set.S with type elt = Dep.t
 
 val link : filepath list -> filepath -> unit
@@ -38,14 +38,8 @@ type error =
   | Cannot_open_dll of filepath
   | Required_module_unavailable of string * Compilation_unit.t
   | Camlheader of string * filepath
-<<<<<<< HEAD
-  | Wrong_link_order of (string * string) list
-||||||| merged common ancestors
-  | Wrong_link_order of (modname * modname) list
-=======
   | Wrong_link_order of DepSet.t
-  | Multiple_definition of modname * filepath * filepath
->>>>>>> ocaml/5.1
+  | Multiple_definition of string * filepath * filepath
 
 exception Error of error
 

diff --git a/file_formats/cmt_format.mli b/file_formats/cmt_format.mli
@@ -93,13 +93,7 @@ val save_cmt :
   binary_annots ->
   string option ->  (* source file *)
   Env.t -> (* initial env *)
-<<<<<<< HEAD
   Cmi_format.cmi_infos_lazy option -> (* if a .cmi was generated *)
-||||||| merged common ancestors
-  Cmi_format.cmi_infos option -> (* if a .cmi was generated *)
-=======
-  Cmi_format.cmi_infos option -> (* if a .cmi was generated *)
->>>>>>> ocaml/5.1
   Shape.t option ->
   unit