Skip to content

Commit 18525e7

Browse files
author
Ubuntu
committed
Resolve merge conflict in ActiveEditor.tsx
1 parent 5e2ddeb commit 18525e7

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

src/containers/write/ActiveEditor.tsx

+1-3
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,8 @@ const ActiveEditor: React.FC<ActiveEditorProps> = () => {
7676
const post = safe(() => readPostForEdit.data!.post);
7777
useEffect(() => {
7878
if (!post) return;
79-
<<<<<<< HEAD
8079
console.log('post.series', post.series);
81-
=======
82-
>>>>>>> 73f12a01808fdb526603ead04a10d55780b4da6d
80+
8381
if (initialized.current) return;
8482
dispatch(
8583
prepareEdit({

0 commit comments

Comments
 (0)