Skip to content

Commit 8ca31fc

Browse files
committed
chore: introduce no-git-conflict-marker rule
1 parent 6488f8e commit 8ca31fc

File tree

3 files changed

+2
-2
lines changed

3 files changed

+2
-2
lines changed

eslint.config.mjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ export default [
1010
files: ['src/content/**/*.md'],
1111
rules: {
1212
'mark/no-double-space': 'error',
13+
'mark/no-git-conflict-marker': ['error', {skipCode: false}],
1314
},
1415
},
1516
];

src/content/blog/2024/12/05/react-19.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ author: The React Team
44
date: 2024/12/05
55
description: React 19 is now available on npm! In this post, we'll give an overview of the new features in React 19, and how you can adopt them.
66
---
7-
<!-- eslint-disable mark/no-double-space -->
7+
{/*<!-- eslint-disable mark/no-double-space -->*/}
88
December 05, 2024 by [The React Team](/community/team)
99

1010
---

src/content/learn/installation.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ If a framework is not a good fit for your project, you prefer to build your own
6868
No. Create React App has been deprecated. For more information, see [Sunsetting Create React App](/blog/2025/02/14/sunsetting-create-react-app).
6969

7070
</Note>
71-
>>>>>>> ab18d2f0f5151ab0c927a12eb0a64f8170762eff
7271

7372
## 다음 단계 {/*next-steps*/}
7473

0 commit comments

Comments
 (0)