.
This commit is contained in:
parent
c46bda283f
commit
a2551e0e58
@ -98,7 +98,6 @@
|
|||||||
<BoardCommentList
|
<BoardCommentList
|
||||||
:unknown="unknown"
|
:unknown="unknown"
|
||||||
:comments="comments"
|
:comments="comments"
|
||||||
<<<<<<< HEAD
|
|
||||||
:isCommentPassword="isCommentPassword"
|
:isCommentPassword="isCommentPassword"
|
||||||
:isEditTextarea="isEditTextarea"
|
:isEditTextarea="isEditTextarea"
|
||||||
:passwordAlert="passwordAlert"
|
:passwordAlert="passwordAlert"
|
||||||
@ -110,11 +109,6 @@
|
|||||||
@commentDeleted="handleCommentDeleted"
|
@commentDeleted="handleCommentDeleted"
|
||||||
@cancelEdit="handleCancelEdit"
|
@cancelEdit="handleCancelEdit"
|
||||||
@submitEdit="handleSubmitEdit"
|
@submitEdit="handleSubmitEdit"
|
||||||
=======
|
|
||||||
@updateReaction="handleCommentReaction"
|
|
||||||
@submitComment="handleCommentReply"
|
|
||||||
@commentDeleted="handleCommentDeleted"
|
|
||||||
>>>>>>> origin/main
|
|
||||||
/>
|
/>
|
||||||
<Pagination
|
<Pagination
|
||||||
v-if="pagination.pages"
|
v-if="pagination.pages"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user