Skip to content

Commit

Permalink
rebase & resolve merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
bgptr committed Apr 11, 2021
1 parent ea1b117 commit c888b11
Showing 1 changed file with 1 addition and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,7 @@ export function PurchasePage({
<div className={styles.purchaseTicketArea}>
<StakeInfo {...{ sidebarOnBottom }} />
{!isVSPListingEnabled && <EnableVSP onEnableVSP={onEnableVSPListing} />}
<Subtitle
title={<T id="purchase.subtitle" m="Purchase Tickets" />}
className="is-row"></Subtitle>
<Subtitle title={<T id="purchase.subtitle" m="Purchase Tickets" />} />
{mixedAccount && changeAccount && <PrivacyInfo />}
{spvMode && blocksNumberToNextTicket === 2 ? (
<ShowWarning
Expand Down

0 comments on commit c888b11

Please sign in to comment.