From 19ab0127f5671fbbf962e594eb6977a25638b8ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Al=D0=B5x=D0=B0nder=20Lysik=D0=BEv?=
<alexander.lysikov@demlabs.net>
Date: Thu, 27 Jun 2019 22:35:40 +0500
Subject: [PATCH] fix confict with to master
---
dap_chain_net.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/dap_chain_net.c b/dap_chain_net.c
index 7e0e47f621..f16ece66e4 100644
--- a/dap_chain_net.c
+++ b/dap_chain_net.c
@@ -78,8 +78,7 @@ typedef struct dap_chain_net_pvt{
dap_chain_node_addr_t * node_addr;
dap_chain_node_info_t * node_info; // Current node's info
- dap_chain_node_client_t * links;
- size_t link_cur;
+ dap_chain_node_client_t *links;
size_t links_count;
dap_chain_node_addr_t *links_addrs;
--
GitLab