Skip to content

Commit a08d7d1

Browse files
authored
fix: resolve conflict
1 parent 03a5524 commit a08d7d1

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

src/content/reference/react/useRef.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -228,11 +228,7 @@ function MyComponent() {
228228
229229
如果 **不得不** 在渲染期间读取 [或者写入](/reference/react/useState#storing-information-from-previous-renders),[使用 state](/reference/react/useState) 代替。
230230
231-
<<<<<<< HEAD
232-
当你打破这些规则时,你的组件可能仍然可以工作,但是我们为 React 添加的大多数新功能将依赖于这些预期行为。阅读 [保持你的组件纯粹](/learn/keeping-components-pure#where-you-can-cause-side-effects) 以了解更多信息。
233-
=======
234-
When you break these rules, your component might still work, but most of the newer features we're adding to React will rely on these expectations. Read more about [keeping your components pure.](/learn/keeping-components-pure#where-you-_can_-cause-side-effects)
235-
>>>>>>> f5ffb3f0fb67565927fc07789a0ebe04dbac33f7
231+
当你打破这些规则时,你的组件可能仍然可以工作,但是我们为 React 添加的大多数新功能将依赖于这些预期行为。阅读 [保持你的组件纯粹](/learn/keeping-components-pure#where-you-_can_-cause-side-effects) 以了解更多信息。
236232
237233
</Pitfall>
238234

0 commit comments

Comments
 (0)