From 8be9457ab2ad47fa659c776985b628e95e980d9b Mon Sep 17 00:00:00 2001
From: dysuby <dysuby@gmail.com>
Date: Sun, 15 Jun 2025 16:49:39 +0800
Subject: [PATCH] fix: unresolved conflicts

---
 src/content/learn/keeping-components-pure.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/content/learn/keeping-components-pure.md b/src/content/learn/keeping-components-pure.md
index 843f65bccf..d910306a17 100644
--- a/src/content/learn/keeping-components-pure.md
+++ b/src/content/learn/keeping-components-pure.md
@@ -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({