aboutsummaryrefslogtreecommitdiffstats
path: root/development/states/tx-list-items.json
diff options
context:
space:
mode:
authorbrunobar79 <brunobar79@gmail.com>2018-11-07 09:21:19 +0800
committerbrunobar79 <brunobar79@gmail.com>2018-11-07 09:21:19 +0800
commitc651212025ab7cd0309d96be6687c1eba35ab9fa (patch)
treefa5a6020daae332c5df47bdee3492e8a079375e3 /development/states/tx-list-items.json
parent9c1b2108f69334884473eb95758e2d1c02c984d6 (diff)
parent7f944923d170d6e7e04f6e238d2fd5f80abe3161 (diff)
downloadtangerine-wallet-browser-c651212025ab7cd0309d96be6687c1eba35ab9fa.tar
tangerine-wallet-browser-c651212025ab7cd0309d96be6687c1eba35ab9fa.tar.gz
tangerine-wallet-browser-c651212025ab7cd0309d96be6687c1eba35ab9fa.tar.bz2
tangerine-wallet-browser-c651212025ab7cd0309d96be6687c1eba35ab9fa.tar.lz
tangerine-wallet-browser-c651212025ab7cd0309d96be6687c1eba35ab9fa.tar.xz
tangerine-wallet-browser-c651212025ab7cd0309d96be6687c1eba35ab9fa.tar.zst
tangerine-wallet-browser-c651212025ab7cd0309d96be6687c1eba35ab9fa.zip
fix merge conflicts
Diffstat (limited to 'development/states/tx-list-items.json')
-rw-r--r--development/states/tx-list-items.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/development/states/tx-list-items.json b/development/states/tx-list-items.json
index cbffa98e5..e83179a17 100644
--- a/development/states/tx-list-items.json
+++ b/development/states/tx-list-items.json
@@ -104,7 +104,7 @@
"send": {},
"currentLocale": "en",
"preferences": {
- "useETHAsPrimaryCurrency": true
+ "useNativeCurrencyAsPrimaryCurrency": true
}
},
"appState": {