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 /mascara/src/app/buy-ether-widget/index.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 'mascara/src/app/buy-ether-widget/index.js')
| -rw-r--r-- | mascara/src/app/buy-ether-widget/index.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mascara/src/app/buy-ether-widget/index.js b/mascara/src/app/buy-ether-widget/index.js index 9fe659daa..c60221a0a 100644 --- a/mascara/src/app/buy-ether-widget/index.js +++ b/mascara/src/app/buy-ether-widget/index.js @@ -1,4 +1,5 @@ -import React, {Component, PropTypes} from 'react' +import React, { Component } from 'react' +import PropTypes from 'prop-types' import classnames from 'classnames' import {connect} from 'react-redux' import {qrcode} from 'qrcode-npm' |