[*] Conflicts resolving (01970c05) · Commits · cellframe / celllframe-node · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

celllframe-node
- Activity
- Members
- Labels
- Terraform modules
- Incidents

Snippets Groups Projects

01970c05

Commit 01970c05 authored 4 years ago by Roman Khlopkov

🔜

Downloads
- Plain Diff

[*] Conflicts resolving

parents 5cf751c8 c80d969a

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 3 additions, 3 deletions

CMakeLists.txt
cellframe-sdk 1 addition, 1 deletion

cellframe-sdk
dist/share/configs/network/kelvin-testnet.cfg.tpl 30 additions, 22 deletions

dist/share/configs/network/kelvin-testnet.cfg.tpl
prod_build/linux/debian/conf/dependencies 1 addition, 1 deletion

prod_build/linux/debian/conf/dependencies
sources/main.c 11 additions, 26 deletions

sources/main.c

with 46 additions and 53 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