fixed conflicts (d1eb50fb) · Commits · cellframe / cellframe-sdk · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

cellframe-sdk
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

d1eb50fb

Commit d1eb50fb authored 7 months ago by roman.padenkov

Downloads
- Plain Diff

fixed conflicts

parents 48dc435c 1ec41004

No related branches found

No related tags found

Loading

Pipeline #44865 failed with stage

in 11 minutes and 17 seconds

Changes 8
Pipelines 1

Expand all Hide whitespace changes

Inline Side-by-side

Showing

cellframe-sdk.pro 6 additions, 6 deletions

cellframe-sdk.pro
modules/net/dap_chain_ledger.c 5 additions, 5 deletions

modules/net/dap_chain_ledger.c
modules/net/dap_chain_net.c 6 additions, 7 deletions

modules/net/dap_chain_net.c
modules/net/include/dap_chain_ledger.h 4 additions, 3 deletions

modules/net/include/dap_chain_ledger.h
modules/service/stake/dap_chain_net_srv_stake_lock.c 5 additions, 8 deletions

modules/service/stake/dap_chain_net_srv_stake_lock.c
modules/service/stake/dap_chain_net_srv_stake_pos_delegate.c 451 additions, 141 deletions

modules/service/stake/dap_chain_net_srv_stake_pos_delegate.c
modules/service/stake/include/dap_chain_net_srv_stake_pos_delegate.h 2 additions, 1 deletion

...vice/stake/include/dap_chain_net_srv_stake_pos_delegate.h
modules/service/xchange/dap_chain_net_srv_xchange.c 2 additions, 1 deletion

modules/service/xchange/dap_chain_net_srv_xchange.c

with 481 additions and 172 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment