From 2cdab1dc2649a6eb7da051d1518e7f5e8d8528a1 Mon Sep 17 00:00:00 2001 From: quangdz1704 Date: Thu, 30 May 2024 20:00:21 +0700 Subject: [PATCH 1/2] fix: update link --- src/layouts/Sidebar.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/layouts/Sidebar.tsx b/src/layouts/Sidebar.tsx index 62e78682..b52879aa 100644 --- a/src/layouts/Sidebar.tsx +++ b/src/layouts/Sidebar.tsx @@ -187,7 +187,11 @@ const Sidebar: React.FC<{}> = React.memo((props) => { +<<<<<<< Updated upstream +======= + +>>>>>>> Stashed changes From 970f3e22c00e7867351e7fc5f1996119de87e17a Mon Sep 17 00:00:00 2001 From: quangdz1704 Date: Thu, 30 May 2024 20:01:11 +0700 Subject: [PATCH 2/2] fix: update link --- src/layouts/Sidebar.tsx | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/layouts/Sidebar.tsx b/src/layouts/Sidebar.tsx index b52879aa..2c20fb2c 100644 --- a/src/layouts/Sidebar.tsx +++ b/src/layouts/Sidebar.tsx @@ -187,11 +187,7 @@ const Sidebar: React.FC<{}> = React.memo((props) => { -<<<<<<< Updated upstream - -======= ->>>>>>> Stashed changes