aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app
diff options
context:
space:
mode:
Diffstat (limited to 'ui/app')
-rw-r--r--ui/app/components/pages/home.js4
1 files changed, 0 insertions, 4 deletions
diff --git a/ui/app/components/pages/home.js b/ui/app/components/pages/home.js
index cd4bf9033..97aaedd37 100644
--- a/ui/app/components/pages/home.js
+++ b/ui/app/components/pages/home.js
@@ -40,7 +40,6 @@ class Home extends Component {
unapprovedTypedMessagesCount = 0,
suggestedTokens = {},
unconfirmedTransactionsCount = 0,
-
} = this.props
// suggested new tokens
@@ -177,11 +176,8 @@ Home.propTypes = {
isPopup: PropTypes.bool,
isMouseUser: PropTypes.bool,
t: PropTypes.func,
-<<<<<<< HEAD
suggestedTokens: PropTypes.object,
-=======
unconfirmedTransactionsCount: PropTypes.number,
->>>>>>> develop
}
function mapStateToProps (state) {