eror

src/slices/book.ts

@@ -64,8 +64,6 @@ const bookSlice = createSlice({
     },
     /** CurrentPage 갱신 @dispatch */
     updateCurrentPage(state, action: PayloadAction<Page>) {
-<<<<<<< HEAD
-=======
       if (
         state.currentLocation.currentPage == action.payload.currentPage &&
         action.payload.chapterName
@@ -76,7 +74,6 @@ const bookSlice = createSlice({
         // console.log(x[1]);
         console.log("فصل بعد");
       }
->>>>>>> e8ebd6db27fa5c5048decd0d52f266d83a8cf52c
       state.currentLocation = action.payload;
     },
     /** Book 초기화 @dispatch */