From 206b536a97ad000f79072f2ff7dda0a3a18ca918 Mon Sep 17 00:00:00 2001
From: quangnhan <tranquangnhan1606@gmail.com>
Date: Mon, 13 Sep 2021 10:02:16 +0700
Subject: [PATCH] bug: conflict

---
 .../common/TabCommon/components/TabItem/TabItem.tsx       | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/components/common/TabCommon/components/TabItem/TabItem.tsx b/src/components/common/TabCommon/components/TabItem/TabItem.tsx
index cc1737e44..49750dc55 100644
--- a/src/components/common/TabCommon/components/TabItem/TabItem.tsx
+++ b/src/components/common/TabCommon/components/TabItem/TabItem.tsx
@@ -1,9 +1,5 @@
 import classNames from 'classnames'
-<<<<<<< HEAD
-import React, { RefObject, useRef } from 'react'
-=======
 import React from 'react'
->>>>>>> 88f90912429447f6ae7bafa77484465965e0ee13
 import s from './TabItem.module.scss'
 
 interface TabItemProps {
@@ -32,8 +28,4 @@ const TabItem = ({
   )
 }
 
-<<<<<<< HEAD
 export default TabItem
-=======
-export default TabItem
->>>>>>> 88f90912429447f6ae7bafa77484465965e0ee13