Skip to content

Commit b30b020

Browse files
committed
Resolve merge conflicts
1 parent bb606e3 commit b30b020

File tree

3 files changed

+166
-239
lines changed

3 files changed

+166
-239
lines changed

package.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,7 @@
3535
"classnames": "^2.2.6",
3636
"debounce": "^1.2.1",
3737
"github-slugger": "^1.3.0",
38-
<<<<<<< HEAD
39-
"next": "15.4.8",
40-
=======
4138
"next": "15.1.9",
42-
>>>>>>> e22544e68d6fffda33332771efe27034739f35a4
4339
"next-remote-watch": "^1.0.0",
4440
"parse-numeric-range": "^1.2.0",
4541
"react": "^19.0.0",

src/content/versions.md

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,21 +53,14 @@ title: Версії React
5353
- [React Compiler Case Studies](https://www.youtube.com/watch?v=lvhPq5chokM)
5454
- [React 19 Deep Dive: Coordinating HTML](https://www.youtube.com/watch?v=IBBN-s77YSI)
5555

56-
<<<<<<< HEAD
5756
**Релізи**
57+
- [v19.2.1 (Грудень, 2025)](https://github.com/facebook/react/blob/main/CHANGELOG.md#1921-dec-3-2025)
5858
- [v19.2.0 (Жовтень, 2025)](https://github.com/facebook/react/blob/main/CHANGELOG.md#1920-october-1st-2025)
59+
- [v19.1.2 (Грудень, 2025)](https://github.com/facebook/react/blob/main/CHANGELOG.md#1912-dec-3-2025)
60+
- [v19.1.1 (Липень, 2025)](https://github.com/facebook/react/blob/main/CHANGELOG.md#1911-july-28-2025)
5961
- [v19.1.0 (Березень, 2025)](https://github.com/facebook/react/blob/main/CHANGELOG.md#1910-march-28-2025)
62+
- [v19.0.1 (Грудень, 2025)](https://github.com/facebook/react/blob/main/CHANGELOG.md#1901-dec-3-2025)
6063
- [v19.0.0 (Грудень, 2024)](https://github.com/facebook/react/blob/main/CHANGELOG.md#1900-december-5-2024)
61-
=======
62-
**Releases**
63-
- [v19.2.1 (December, 2025)](https://github.com/facebook/react/blob/main/CHANGELOG.md#1921-dec-3-2025)
64-
- [v19.2.0 (October, 2025)](https://github.com/facebook/react/blob/main/CHANGELOG.md#1920-october-1st-2025)
65-
- [v19.1.2 (December, 2025)](https://github.com/facebook/react/blob/main/CHANGELOG.md#1912-dec-3-2025)
66-
- [v19.1.1 (July, 2025)](https://github.com/facebook/react/blob/main/CHANGELOG.md#1911-july-28-2025)
67-
- [v19.1.0 (March, 2025)](https://github.com/facebook/react/blob/main/CHANGELOG.md#1910-march-28-2025)
68-
- [v19.0.1 (December, 2025)](https://github.com/facebook/react/blob/main/CHANGELOG.md#1901-dec-3-2025)
69-
- [v19.0.0 (December, 2024)](https://github.com/facebook/react/blob/main/CHANGELOG.md#1900-december-5-2024)
70-
>>>>>>> e22544e68d6fffda33332771efe27034739f35a4
7164

7265
### React 18 {/*react-18*/}
7366

0 commit comments

Comments
 (0)