diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-07-04 01:31:30 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-07-04 01:31:30 +0800 |
| commit | 3290421e2f16bd0ea1b13ba3f3d93fc4d233c750 (patch) | |
| tree | dfbcfb70609fd24074dad6686f447a452313c6c6 /ui/app/reducers/app.js | |
| parent | 85fd75c21f0e64817b3d4c4d51f37649e3a81233 (diff) | |
| parent | 1f0cf11af1c94e750bbc4c5238c3ee028350a6c6 (diff) | |
| download | tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.tar.gz tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.tar.zst tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.zip | |
fix merge conflicts
Diffstat (limited to 'ui/app/reducers/app.js')
| -rw-r--r-- | ui/app/reducers/app.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js index 9cacf5fe7..f453812b9 100644 --- a/ui/app/reducers/app.js +++ b/ui/app/reducers/app.js @@ -684,7 +684,7 @@ function reduceApp (state, action) { case actions.GAS_LOADING_FINISHED: return extend(appState, { gasIsLoading: false, - }) + }) default: return appState |