fix - merge conflict

blockchain · May 31, 2018 · 0dd3523 · 0dd3523
1 parent bcb28b6
commit 0dd3523
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...s/blockchain-wallet-v4-frontend/src/scenes/BuySell/CoinifyCheckout/Content/OrderReview.js b/...s/blockchain-wallet-v4-frontend/src/scenes/BuySell/CoinifyCheckout/Content/OrderReview.js
@@ -2,7 +2,7 @@ import React, { Fragment } from 'react'
 import styled from 'styled-components'
 import { Text, Button, HeartbeatLoader, Link } from 'blockchain-info-components'
 import { Remote } from 'blockchain-wallet-v4/src'
-import FaqRow from 'components/Faq/FaqRow'
+import FaqRow from 'layouts/Wallet/TrayRight/Faq/FaqRow'
 import CountdownTimer from 'components/Form/CountdownTimer'
 import { Wrapper as ExchangeCheckoutWrapper } from '../../ExchangeCheckout'
 import { spacing } from 'services/StyleService'

diff --git a/...ages/blockchain-wallet-v4-frontend/src/scenes/BuySell/SfoxCheckout/Content/OrderReview.js b/...ages/blockchain-wallet-v4-frontend/src/scenes/BuySell/SfoxCheckout/Content/OrderReview.js
@@ -2,7 +2,7 @@ import React, { Fragment } from 'react'
 import styled from 'styled-components'
 import { Text, Button, Icon, HeartbeatLoader, Link, Tooltip } from 'blockchain-info-components'
 import { Remote } from 'blockchain-wallet-v4/src'
-import FaqRow from 'components/Faq/FaqRow'
+import FaqRow from 'layouts/Wallet/TrayRight/Faq/FaqRow'
 import CountdownTimer from 'components/Form/CountdownTimer'
 import { Wrapper as ExchangeCheckoutWrapper } from '../../ExchangeCheckout'
 import { flex, spacing } from 'services/StyleService'