merging error fix

eclipse-zenoh · Aug 28, 2024 · a85b91b · a85b91b
1 parent 4cbdf9f
commit a85b91b
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/include/zenoh_commons.h b/include/zenoh_commons.h
@@ -724,7 +724,6 @@ typedef struct z_get_options_t {
    * The timeout for the query in milliseconds. 0 means default query timeout from zenoh configuration.
    */
   uint64_t timeout_ms;
-  enum zcu_reply_keyexpr_t accept_replies;
 } z_get_options_t;
 typedef struct z_moved_hello_t {
   struct z_owned_hello_t _this;

diff --git a/src/get.rs b/src/get.rs
@@ -210,7 +210,6 @@ pub struct z_get_options_t {
     pub attachment: Option<&'static mut z_moved_bytes_t>,
     /// The timeout for the query in milliseconds. 0 means default query timeout from zenoh configuration.
     pub timeout_ms: u64,
-    pub accept_replies: zcu_reply_keyexpr_t,
 }
 
 /// Constructs default `z_get_options_t`