From f258c3654d917f7d15c0f114e1dd7dad062fc861 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Wed, 15 Mar 2023 16:05:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=B1=BB=E3=80=81=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=A2=84=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/course/index.tsx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/pages/course/index.tsx b/src/pages/course/index.tsx
index ee57b50..34d96be 100644
--- a/src/pages/course/index.tsx
+++ b/src/pages/course/index.tsx
@@ -43,11 +43,8 @@ export const CoursePage = () => {
   const [dep_ids, setDepIds] = useState<any>([]);
   const [selLabel, setLabel] = useState<string>("全部课程");
   const [categoryCount, setCategoryCount] = useState<any>({});
-<<<<<<< HEAD
   const [tabKey, setTabKey] = useState(1);
-=======
   const [pureTotal, setPureTotal] = useState(0);
->>>>>>> fc90ddf2cc1481f6aa7fb80b7d2746f7bbc94fcd
 
   const items: TabsProps["items"] = [
     {