Skip to content

Commit

Permalink
fix: merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
mahdiyeh-deriv committed Jan 29, 2023
1 parent 460a59f commit 116407e
Showing 1 changed file with 1 addition and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -273,4 +273,5 @@ export default connect(({ client, common, ui, menu, modules, notifications }) =>
toggleNotifications: notifications.toggleNotificationsModal,
is_trading_assessment_for_existing_user_enabled: ui.is_trading_assessment_for_existing_user_enabled,
is_landing_company_loaded: client.is_landing_company_loaded,
setIsPreAppStore: client.setIsPreAppStore,
}))(withRouter(DefaultHeader));

0 comments on commit 116407e

Please sign in to comment.