From ba130c9be031fbffa896bee90d0033ed50c29fc5 Mon Sep 17 00:00:00 2001
From: Roman Khlopkov <roman.khlopkov@demlabs.net>
Date: Wed, 27 May 2020 19:08:59 +0300
Subject: [PATCH] conflicts resolving

---
 dist/etc/network/kelvin-testnet/chain-0.cfg | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/dist/etc/network/kelvin-testnet/chain-0.cfg b/dist/etc/network/kelvin-testnet/chain-0.cfg
index 83a4e56ec..39caa815e 100644
--- a/dist/etc/network/kelvin-testnet/chain-0.cfg
+++ b/dist/etc/network/kelvin-testnet/chain-0.cfg
@@ -19,13 +19,8 @@ datum_add_hashes_count=1
 
 # Switched off to false because hash symbols below are not well recognized
 
-<<<<<<< HEAD
-is_static_genesis_event=false 
-static_genesis_event=0xEB2152E716245D067BEA80E8CB6D7C35859B2E0E91AF4201486BB443F6AEE7FF
-=======
 is_static_genesis_event=true
 static_genesis_event=0x642DEBE847A73FA0505C6648C1086675B6B4ADDDC4A8D333DCCD4169228E1E97
->>>>>>> features-3927
 
 [dag-poa]
 auth_certs_prefix=kelvin.testnet.root
-- 
GitLab