Resolve merge conflicts with rolling

Signed-off-by: Yadunund <[email protected]>
ros2 · Jan 12, 2024 · 5c6f26b · 5c6f26b
2 parents 6367fd2 + b201d81
commit 5c6f26b
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/rmw_zenoh_cpp/src/detail/rmw_data_types.hpp b/rmw_zenoh_cpp/src/detail/rmw_data_types.hpp
@@ -174,6 +174,7 @@ struct rmw_service_data_t
 struct rmw_client_data_t
 {
   z_owned_keyexpr_t keyexpr;
+
   z_owned_closure_reply_t zn_closure_reply;
 
   // Liveliness token for the client.