diff options
| author | Alexander Tseung <alextsg@gmail.com> | 2018-03-27 15:20:35 +0800 |
|---|---|---|
| committer | Alexander Tseung <alextsg@gmail.com> | 2018-03-27 15:20:35 +0800 |
| commit | 6f367a5a6b4fb8918405f233293dc3f4840b4a3d (patch) | |
| tree | c60c01300c90204f8634d1f3e9e79b4ecc2fceda /ui/app/components/tab-bar.js | |
| parent | 72ffa2c3f5abbcb06c8ab5fdf20b9d934c330692 (diff) | |
| parent | e001c0900b5256c0c8769f0c3eb5d2007f5b18d3 (diff) | |
| download | tangerine-wallet-browser-6f367a5a6b4fb8918405f233293dc3f4840b4a3d.tar.gz tangerine-wallet-browser-6f367a5a6b4fb8918405f233293dc3f4840b4a3d.tar.zst tangerine-wallet-browser-6f367a5a6b4fb8918405f233293dc3f4840b4a3d.zip | |
Fix merge conflicts
Diffstat (limited to 'ui/app/components/tab-bar.js')
| -rw-r--r-- | ui/app/components/tab-bar.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/app/components/tab-bar.js b/ui/app/components/tab-bar.js index 32c9e4f24..0016a09c1 100644 --- a/ui/app/components/tab-bar.js +++ b/ui/app/components/tab-bar.js @@ -1,6 +1,6 @@ const { Component } = require('react') const h = require('react-hyperscript') -const PropTypes = require('react').PropTypes +const PropTypes = require('prop-types') const classnames = require('classnames') class TabBar extends Component { |