From a2551e0e5890388a2fb1d43a94713b52cb6ae8c8 Mon Sep 17 00:00:00 2001
From: kimdaae328 <kimdaae328@gmail.com>
Date: Fri, 21 Feb 2025 09:56:39 +0900
Subject: [PATCH] .

---
 src/views/board/BoardView.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/views/board/BoardView.vue b/src/views/board/BoardView.vue
index 898b39d..b9b8173 100644
--- a/src/views/board/BoardView.vue
+++ b/src/views/board/BoardView.vue
@@ -98,7 +98,6 @@
                         <BoardCommentList
                             :unknown="unknown"
                             :comments="comments"
-<<<<<<< HEAD
                             :isCommentPassword="isCommentPassword"
                             :isEditTextarea="isEditTextarea"
                             :passwordAlert="passwordAlert"
@@ -110,11 +109,6 @@
                             @commentDeleted="handleCommentDeleted"
                             @cancelEdit="handleCancelEdit"
                             @submitEdit="handleSubmitEdit"
-=======
-                            @updateReaction="handleCommentReaction"
-                            @submitComment="handleCommentReply"
-                            @commentDeleted="handleCommentDeleted"
->>>>>>> origin/main
                         />
                         <Pagination
                             v-if="pagination.pages"