diff options
author | Kevin Serrano <kevgagser@gmail.com> | 2016-11-19 01:23:20 +0800 |
---|---|---|
committer | Kevin Serrano <kevgagser@gmail.com> | 2016-11-19 01:23:20 +0800 |
commit | bef023fb4a699c16fe0fff30ce18840678ed7ad0 (patch) | |
tree | d11be9af938712aeb554f070822be01b2d7fbceb /development/states/config.json | |
parent | 37d836fa72c75945d436bd94feadb65aa95d7e5f (diff) | |
parent | 39e0a33bba2709971edec0304027f646cb2db3cc (diff) | |
download | tangerine-wallet-browser-bef023fb4a699c16fe0fff30ce18840678ed7ad0.tar.gz tangerine-wallet-browser-bef023fb4a699c16fe0fff30ce18840678ed7ad0.tar.zst tangerine-wallet-browser-bef023fb4a699c16fe0fff30ce18840678ed7ad0.zip |
Resolve merge conflict.
Diffstat (limited to 'development/states/config.json')
-rw-r--r-- | development/states/config.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/development/states/config.json b/development/states/config.json index 22d999158..172f286a1 100644 --- a/development/states/config.json +++ b/development/states/config.json @@ -59,7 +59,7 @@ "transactions": [], "selectedAddress": "0x843963b837841dad3b0f5969ff271108776616df", "network": "2", - "isConfirmed": true, + "isDisclaimerConfirmed": true, "unconfMsgs": {}, "messages": [], "provider": { |