resolve conflict

reactjs · May 7, 2024 · fb7c43c · fb7c43c
1 parent bdb33bf
commit fb7c43c
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/content/blog/2020/12/21/data-fetching-with-react-server-components.md b/src/content/blog/2020/12/21/data-fetching-with-react-server-components.md
@@ -1,15 +1,11 @@
 ---
-<<<<<<< HEAD
 title: "Giới thiệu Zero-Bundle-Size React Server Components"
-=======
-title: "Introducing Zero-Bundle-Size React Server Components"
 author: Dan Abramov, Lauren Tan, Joseph Savona, and Sebastian Markbage
 date: 2020/12/21
-description: 2020 has been a long year. As it comes to an end we wanted to share a special Holiday Update on our research into zero-bundle-size React Server Components.
->>>>>>> 556063bdce0ed00f29824bc628f79dac0a4be9f4
+description: 2020 đã là một năm dài. Khi năm này khép lại, chúng tôi muốn chia sẻ một Bản Cập Nhật Đặc Biệt về nghiên cứu của chúng tôi về zero-bundle-size React Server Components.
 ---
 
-December 21, 2020 by [Dan Abramov](https://twitter.com/dan_abramov), [Lauren Tan](https://twitter.com/potetotes), [Joseph Savona](https://twitter.com/en_JS), and [Sebastian Markbåge](https://twitter.com/sebmarkbage)
+December 21, 2020 bởi [Dan Abramov](https://twitter.com/dan_abramov), [Lauren Tan](https://twitter.com/potetotes), [Joseph Savona](https://twitter.com/en_JS), và [Sebastian Markbåge](https://twitter.com/sebmarkbage)
 
 ---