Kevin Serrano 0a3849ec84 Fix merge conflicts.		2017-03-01 10:01:21 -08:00
..
config_test.js	Tested against code to play nice with unit tests.	2017-02-23 13:56:58 -08:00
save_account_label_test.js	Added ability to nickname wallets locally	2016-05-20 16:18:54 -07:00
set_selected_account_test.js	continue rename selectedAccount to selectedAddress	2017-01-30 15:25:12 -08:00
tx_test.js	Remove irrelevant tests	2017-02-23 17:45:23 -08:00
view_info_test.js	Unify test suites	2016-04-18 11:41:29 -07:00
warning_test.js	Unify test suites	2016-04-18 11:41:29 -07:00