Skip to content

Commit

Permalink
Fix merge conflict build issue
Browse files Browse the repository at this point in the history
  • Loading branch information
AmirAbrams committed Oct 20, 2020
1 parent 722a64b commit da8b5cd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion web/src/components/wallet/Setup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export class WalletSetup extends Component<WalletViewDispatchProps, WalletSetupS
super(props);
// bind events
this.componentDidMount = this.componentDidMount.bind(this);
this.componentWillUnmount = this.componentWillUnmount.bind(this);
this.componentDidUnmount = this.componentDidUnmount.bind(this);
this.onInitWallet = this.onInitWallet.bind(this);
this.onRequestNewWallet = this.onRequestNewWallet.bind(this);
this.onRequestRestoreWallet = this.onRequestRestoreWallet.bind(this);
Expand Down

0 comments on commit da8b5cd

Please sign in to comment.