DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

fix conflict

Browse Source
This commit is contained in:
blackjok3r
2018-12-15 09:37:28 +08:00
parent a52c3a579f
commit 95cada6581
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/komodo_utils.h
View File

@@ -1774,13 +1774,7 @@ void komodo_args(char *argv0)
ASSETCHAINS_SUPPLY = GetArg("-ac_supply",10);
ASSETCHAINS_COMMISSION = GetArg("-ac_perc",0);
ASSETCHAINS_OVERRIDE_PUBKEY = GetArg("-ac_pubkey","");
<<<<<<< HEAD
ASSETCHAINS_SCRIPTPUB = GetArg("-ac_script","");
ASSETCHAINS_FOUNDERS_PERIOD = GetArg("-ac_period",0);
=======
ASSETCHAINS_SCRIPTPUB = GetArg("-ac_script","");
//ASSETCHAINS_FOUNDERS_PERIOD = GetArg("-ac_period",0);
>>>>>>> 655ef3c8ae43446c2cd361677699dcbe37f8fea4
if ( (ASSETCHAINS_STAKED= GetArg("-ac_staked",0)) > 100 )
ASSETCHAINS_STAKED = 100;