diff options
author | brunobar79 <brunobar79@gmail.com> | 2018-11-21 06:44:28 +0800 |
---|---|---|
committer | brunobar79 <brunobar79@gmail.com> | 2018-11-21 06:44:28 +0800 |
commit | 9b1df386de908ae14e0ce169f1231a0d6de77972 (patch) | |
tree | d7fc663343b7ba3c28dff0022ca018a01bea451c /ui/app/components/send/send-content/send-from-row/from-dropdown/from-dropdown.component.js | |
parent | c0557b43e2c493de73c8bf74cfa9e5740c8cfd3f (diff) | |
parent | 5956f8d260270d41f1e5be53f3c058782a1ae7f4 (diff) | |
download | tangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.tar.gz tangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.tar.zst tangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.zip |
fix merge conflicts
Diffstat (limited to 'ui/app/components/send/send-content/send-from-row/from-dropdown/from-dropdown.component.js')
-rw-r--r-- | ui/app/components/send/send-content/send-from-row/from-dropdown/from-dropdown.component.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/app/components/send/send-content/send-from-row/from-dropdown/from-dropdown.component.js b/ui/app/components/send/send-content/send-from-row/from-dropdown/from-dropdown.component.js index 4f43a9d61..d512f7d0b 100644 --- a/ui/app/components/send/send-content/send-from-row/from-dropdown/from-dropdown.component.js +++ b/ui/app/components/send/send-content/send-from-row/from-dropdown/from-dropdown.component.js @@ -12,11 +12,11 @@ export default class FromDropdown extends Component { onSelect: PropTypes.func, openDropdown: PropTypes.func, selectedAccount: PropTypes.object, - }; + } static contextTypes = { t: PropTypes.func, - }; + } render () { const { |