Commit 56a0f73f authored by Bruno Guillaume's avatar Bruno Guillaume

fix conflicts

parents ddd34f06 9fb591b6
......@@ -229,10 +229,7 @@ module G_graph = struct
highest_index: int; (* the next free integer index *)
}
<<<<<<< HEAD
let empty = { domain=None; meta=[]; map=Gid_map.empty; fusion=[]; highest_index=0; }
=======
let empty = {meta=[]; map=Gid_map.empty; highest_index=0; }
let empty = { domain=None; meta=[]; map=Gid_map.empty; highest_index=0; }
(* ---------------------------------------------------------------------- *)
let rename mapping graph =
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment