Indentation fixes.

2017-12-07 17:43:21 +01:00 · 2017-12-07 17:43:21 +01:00 · 375ddd48dc
commit 375ddd48dc
parent 154578827f
4 changed files with 12 additions and 12 deletions
--- a/lib_client_base/client_commands.mli
+++ b/lib_client_base/client_commands.mli
@ -48,7 +48,6 @@ class type full_context = object
  inherit block
 end
 (** The [full_context] allows the client {!command} handlers to work in
->>>>>>> 3ab6ecd4... Client library refactor
     various modes (command line, batch mode, web client, etc.) by
     abstracting some basic operations such as logging and reading
     configuration options. It is passed as parameter to the command
--- a/lib_node_p2p/p2p.ml
+++ b/lib_node_p2p/p2p.ml
@ -541,7 +541,8 @@ module RPC = struct
    let info net point =
      match net.pool with
      | None -> None
-      | Some pool -> Option.map
+      | Some pool ->
+          Option.map
            (P2p_connection_pool.Points.info pool point)
            ~f:info_of_point_info