Skip to content
Snippets Groups Projects
Commit ba130c9b authored by Roman Khlopkov's avatar Roman Khlopkov 🔜
Browse files

conflicts resolving

parent 1fba7701
No related branches found
No related tags found
1 merge request!139features-2844
Hide whitespace changes
Inline Side-by-side
dist/etc/network/kelvin-testnet/chain-0.cfg
+ 0
− 5
View file @ ba130c9b
...@@ -19,13 +19,8 @@ datum_add_hashes_count=1 ...@@ -19,13 +19,8 @@ datum_add_hashes_count=1
# Switched off to false because hash symbols below are not well recognized # 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 is_static_genesis_event=true
static_genesis_event=0x642DEBE847A73FA0505C6648C1086675B6B4ADDDC4A8D333DCCD4169228E1E97 static_genesis_event=0x642DEBE847A73FA0505C6648C1086675B6B4ADDDC4A8D333DCCD4169228E1E97
>>>>>>> features-3927
[dag-poa] [dag-poa]
auth_certs_prefix=kelvin.testnet.root auth_certs_prefix=kelvin.testnet.root
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment