From 7a2769079eddaffcea715697e7b9f29d84883a0a Mon Sep 17 00:00:00 2001
From: Chris Casinghino <ccasinghino@janestreet.com>
Date: Wed, 18 Oct 2023 11:55:47 +0100
Subject: [PATCH] Fix remaining conflicts in `utils/`

---
 utils/ccomp.ml     | 20 ++------------------
 utils/consistbl.ml | 10 ----------
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/utils/ccomp.ml b/utils/ccomp.ml
index 7b9d08ebc8..41d481b2e8 100644
--- a/utils/ccomp.ml
+++ b/utils/ccomp.ml
@@ -143,20 +143,9 @@ let create_archive archive file_list =
     | _ ->
         assert(String.length Config.ar > 0);
         command(Printf.sprintf "%s rc %s %s"
-<<<<<<< HEAD
-                Config.ar quoted_archive (quote_files file_list))
-||||||| merged common ancestors
-        let r1 =
-          command(Printf.sprintf "%s rc %s %s"
-                  Config.ar quoted_archive (quote_files file_list)) in
-        if r1 <> 0 || String.length Config.ranlib = 0
-        then r1
-        else command(Config.ranlib ^ " " ^ quoted_archive)
-=======
                 Config.ar quoted_archive
                 (quote_files ~response_files:Config.ar_supports_response_files
                   file_list))
->>>>>>> ocaml/5.1
 
 let expand_libname cclibs =
   cclibs |> List.map (fun cclib ->
@@ -210,14 +199,9 @@ let call_linker ?(native_toplevel = false) mode output_name files extra =
           )
           (Filename.quote output_name)
           ""  (*(Clflags.std_include_flag "-I")*)
-<<<<<<< HEAD
           (if native_toplevel then ""
-           else quote_prefixed "-L" (Load_path.get_paths ()))
-||||||| merged common ancestors
-          (quote_prefixed "-L" (Load_path.get_paths ()))
-=======
-          (quote_prefixed ~response_files:true "-L" (Load_path.get_paths ()))
->>>>>>> ocaml/5.1
+           else
+             quote_prefixed ~response_files:true "-L" (Load_path.get_paths ()))
           (String.concat " " (List.rev !Clflags.all_ccopts))
           (quote_files ~response_files:true files)
           extra
diff --git a/utils/consistbl.ml b/utils/consistbl.ml
index 35e7649d20..e4fd412095 100644
--- a/utils/consistbl.ml
+++ b/utils/consistbl.ml
@@ -63,22 +63,12 @@ end) = struct
     with Not_found ->
       raise (Not_available name)
 
-<<<<<<< HEAD
-  let set tbl name data crc source = Module_name.Tbl.add tbl name (data, crc, source)
-
   let source tbl name = thd3 (Module_name.Tbl.find tbl name)
 
   let find t name =
     match Module_name.Tbl.find t name with
     | exception Not_found -> None
     | (data, crc, _) -> Some (data, crc)
-||||||| merged common ancestors
-  let set tbl name crc source = Module_name.Tbl.add tbl name (crc, source)
-
-  let source tbl name = snd (Module_name.Tbl.find tbl name)
-=======
-  let source tbl name = snd (Module_name.Tbl.find tbl name)
->>>>>>> ocaml/5.1
 
   let extract l tbl =
     let l = List.sort_uniq Module_name.compare l in