Commit f17608e9 authored by Michele Alberti's avatar Michele Alberti
Browse files

[Server] Resolve conflicts.

parent 00ff948a
......@@ -168,7 +168,6 @@ let () = Request.register ~page
(* -------------------------------------------------------------------------- *)
module Property = struct
type p
let signature =
Record.signature ~page ~name:"property"
......@@ -207,9 +206,13 @@ let get_properties () =
Property_status.fold (fun ip acc -> Property.make ip :: acc) []
let () =
Request.register ~page ~kind:`GET ~name:"kernel.getProperties"
Request.register
~page
~kind:`GET
~name:"kernel.ast.getProperties"
~descr:(Md.plain "Collect all logical properties")
~input:(module Junit) ~output:(module Jlist (Property))
~input:(module Junit)
~output:(module Jlist (Property))
get_properties
(* -------------------------------------------------------------------------- *)
......
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