Skip to content

Commit 76a8ed1

Browse files
merging all conflicts
2 parents 7f92991 + 6274d4f commit 76a8ed1

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

src/content/learn/adding-interactivity.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,11 @@ setCount(count + 1); // Request a re-render with 1
265265
console.log(count); // Still 0!
266266
```
267267

268+
<<<<<<< HEAD
268269
이 동작은 미묘한 버그를 피하는 데 도움이 됩니다. 간단한 채팅 앱을 예시로 들겠습니다. "Send"를 먼저 누른 *다음* 수신자를 Bob으로 변경하면 어떻게 될지 추측해 보세요. 5초 후에 `alert`에 어떤 이름이 나타날까요?
270+
=======
271+
This behavior helps you avoid subtle bugs. Here is a little chat app. Try to guess what happens if you press "Send" first and *then* change the recipient to Bob. Whose name will appear in the `alert` five seconds later?
272+
>>>>>>> 6274d4faf5afcef74357871d06191558050e23d3
269273
270274
<Sandpack>
271275

vercel.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,11 @@
9191
},
9292
{
9393
"source": "/link/legacy-context",
94+
<<<<<<< HEAD
9495
"destination": "https://ko.react.dev/blog/2024/04/25/react-19-upgrade-guide#removed-removing-legacy-context",
96+
=======
97+
"destination": "https://react.dev/blog/2024/04/25/react-19-upgrade-guide#removed-removing-legacy-context",
98+
>>>>>>> 6274d4faf5afcef74357871d06191558050e23d3
9599
"permanent": false
96100
},
97101
{

0 commit comments

Comments
 (0)