fix(Merge): resolve conflicts

blockchain · May 3, 2018 · 5e4e49b · 5e4e49b
1 parent f7d6695
commit 5e4e49b
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 13 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/components/Faq/FaqContent/index.js b/packages/blockchain-wallet-v4-frontend/src/components/Faq/FaqContent/index.js
diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/MobileNumberVerify/template.js b/packages/blockchain-wallet-v4-frontend/src/modals/MobileNumberVerify/template.js
@@ -42,19 +42,11 @@ const MobileNumberVerify = (props) => {
           </Code>
           <Options>
             <Text size='14px' weight={300} style={{ ...flex('row'), ...spacing('pt-5') }}>
-<<<<<<< HEAD
-              <FormattedMessage id='modals.mobilenumberverify.get_code' defaultMessage={'Didn\'t get the code?'} />
-=======
               <FormattedMessage id='modals.mobilenumberverify.get_code1' defaultMessage={'Didn\'t get the code?'} />
->>>>>>> development
               <Link size='14px' weight={300} onClick={handleResend}>
                 <FormattedMessage id='modals.mobilenumberverify.resend' defaultMessage={'Resend'} />
               </Link>
-<<<<<<< HEAD
-              <FormattedMessage id='modals.mobilenumberverify.get_code' defaultMessage={'or'} />
-=======
               <FormattedMessage id='modals.mobilenumberverify.get_code2' defaultMessage='or' />
->>>>>>> development
               <Link size='14px' weight={300} capitalize onClick={handleChange}>
                 <FormattedMessage id='modals.mobilenumberverify.change' defaultMessage='change mobile number' />
               </Link>