Skip to content

Commit

Permalink
Merge pull request #798 from ZettaScaleLabs/fix_merge_issue
Browse files Browse the repository at this point in the history
Fix merge issue
  • Loading branch information
milyin authored Nov 20, 2024
2 parents ee4c5e8 + 9e35c5f commit 6eb0b42
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/api/liveliness.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ void _z_liveliness_token_clear(_z_liveliness_token_t *token) {
_Z_OWNED_FUNCTIONS_VALUE_NO_COPY_IMPL(_z_liveliness_token_t, liveliness_token, _z_liveliness_token_check,
_z_liveliness_token_null, _z_liveliness_token_clear)

z_result_t z_liveliness_token_options_t_default(z_liveliness_token_options_t *options) {
z_result_t z_liveliness_token_options_default(z_liveliness_token_options_t *options) {
options->__dummy = 0;
return _Z_RES_OK;
}
Expand Down

0 comments on commit 6eb0b42

Please sign in to comment.