From 697672f4f25f00cf6895e41bd8604a99b4d6c64a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9C=A0=20=EC=B1=84=EB=A6=B0?= <dbcofls6961@ajou.ac.kr>
Date: Sun, 26 Nov 2023 03:08:00 +0900
Subject: [PATCH] Update mainAside.js
---
src/pages/mainAside.js | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/src/pages/mainAside.js b/src/pages/mainAside.js
index d20e007..9e379d4 100644
--- a/src/pages/mainAside.js
+++ b/src/pages/mainAside.js
@@ -3,10 +3,6 @@ import styles from './mainAside.module.css';
function NextSchedule(props) {
const { nextSchedules } = props.data;
-<<<<<<< HEAD
-=======
-
->>>>>>> 345bf12643aaa2ee3918a6502c96fa159a0886af
if (!nextSchedules || !Array.isArray(nextSchedules)) {
return <p className={styles.noContent}>다음 일정이 없습니다.</p>;
@@ -29,10 +25,6 @@ function NextSchedule(props) {
function Notice(props){
const { subscribeNotices } = props.data;
-<<<<<<< HEAD
-=======
-
->>>>>>> 345bf12643aaa2ee3918a6502c96fa159a0886af
if (!subscribeNotices || !Array.isArray(subscribeNotices)) {
return <p className={styles.noContent}>최근 공지가 없습니다.</p>;
@@ -98,4 +90,4 @@ function Schedule(){
)
}
-export default Schedule;
\ No newline at end of file
+export default Schedule;
--
GitLab