fix: resolve conflict

reactjs · Sep 23, 2023 · 8cd26af · 8cd26af
1 parent 37bb15b
commit 8cd26af
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/src/content/reference/react/cache.md b/src/content/reference/react/cache.md
@@ -4,7 +4,6 @@ canary: true
 ---
 
 <Canary>
-<<<<<<< HEAD
 * `cache` 仅供与 [React 服务器组件](/blog/2023/03/22/react-labs-what-we-have-been-working-on-march-2023#react-server-components) 一起使用。请参阅支持 React 服务器组件的 [框架](/learn/start-a-new-react-project#bleeding-edge-react-frameworks)。
 
 * `cache` 仅在 React 的 [Canary](/community/versioning-policy#canary-channel) 和 [experimental](/community/versioning-policy#experimental-channel) 渠道中可用。在将 `cache` 用于生产环境之前，请确保了解其限制。查看此处了解有关 [React 发布渠道的更多信息](/community/versioning-policy#all-release-channels)。