Skip to content

Commit 52786cc

Browse files
committed
fix: resolve merge conflicts and update translations of reference cache page
1 parent beff101 commit 52786cc

1 file changed

Lines changed: 0 additions & 9 deletions

File tree

src/content/reference/react/cache.md

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,11 @@ title: cache
33
canary: true
44
---
55

6-
<<<<<<< HEAD
7-
<Canary>
8-
* `cache` is only for use with [React Server Components](https://react.dev/blog/2023/03/22/react-labs-what-we-have-been-working-on-march-2023#react-server-components). See [frameworks](https://react.dev/learn/start-a-new-react-project#bleeding-edge-react-frameworks) that support React Server Components.
9-
10-
* `cache` is only available in React’s [Canary](https://react.dev/community/versioning-policy#canary-channel) and [experimental](https://react.dev/community/versioning-policy#experimental-channel) channels. Please ensure you understand the limitations before using `cache` in production. Learn more about [React's release channels here](/community/versioning-policy#all-release-channels).
11-
</Canary>
12-
=======
136
<RSC>
147

158
`cache` is only for use with [React Server Components](/blog/2023/03/22/react-labs-what-we-have-been-working-on-march-2023#react-server-components).
169

1710
</RSC>
18-
>>>>>>> 50d6991ca6652f4bc4c985cf0c0e593864f2cc91
19-
2011
<Intro>
2112

2213
`cache` lets you cache the result of a data fetch or computation.

0 commit comments

Comments
 (0)