crowetic/commerce
1
0
Fork 1
mirror of https://github.com/vercel/commerce.git synced 2025-07-22 12:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

bug: conflict

Browse Source
This commit is contained in:
quangnhan
2021-09-13 10:02:16 +07:00
parent 25558e5ce4
commit 206b536a97
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/common/TabCommon/components/TabItem/TabItem.tsx
View File

@@ -1,9 +1,5 @@
import classNames from 'classnames' import classNames from 'classnames'
<<<<<<< HEAD
import React, { RefObject, useRef } from 'react'
=======
import React from 'react' import React from 'react'
>>>>>>> 88f90912429447f6ae7bafa77484465965e0ee13
import s from './TabItem.module.scss' import s from './TabItem.module.scss'
interface TabItemProps { interface TabItemProps {
@@ -32,8 +28,4 @@ const TabItem = ({
) )
} }
<<<<<<< HEAD
export default TabItem export default TabItem
=======
export default TabItem
>>>>>>> 88f90912429447f6ae7bafa77484465965e0ee13