Skip to content

fix: unresolved conflicts #1730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
awxiaoxian2020 merged 1 commit into from
Jun 15, 2025
Merged

fix: unresolved conflicts #1730

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions src/content/learn/keeping-components-pure.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,13 +773,8 @@ li {

```js src/StoryTray.js active
export default function StoryTray({ stories }) {
<<<<<<< HEAD
// 复制数组！
let storiesToDisplay = stories.slice();
=======
// Copy the array!
const storiesToDisplay = stories.slice();
>>>>>>> 50d6991ca6652f4bc4c985cf0c0e593864f2cc91

// 不影响原始数组：
storiesToDisplay.push({
Expand Down