Skip to content

Commit 1f5a27b

Browse files
committed
Fixing merge
1 parent 79f0353 commit 1f5a27b

1 file changed

Lines changed: 0 additions & 3 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,11 @@ Undocumented APIs should be considered internal and may change without warning.
1010

1111
- Hardware acceleration for `backgroundColor` in supported browsers.
1212

13-
<<<<<<< Updated upstream
14-
=======
1513
### Fixed
1614

1715
- `AnimatePresence`: Exiting children no longer interleave with entering children, which could reorder and remount children present in both renders.
1816
- `motion`: Throw error when passing a custom `motion` component an incorrect `ref` type.
1917

20-
>>>>>>> Stashed changes
2118
## [12.42.2] 2026-07-01
2219

2320
### Fixed

0 commit comments

Comments
 (0)