From da8090fa43900c1acb0e04ef5dce00c9b9f85304 Mon Sep 17 00:00:00 2001 From: Mark Lawlor Date: Thu, 14 Mar 2024 16:05:39 +1000 Subject: [PATCH] fix changelog merge --- packages/expo-router/CHANGELOG.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/expo-router/CHANGELOG.md b/packages/expo-router/CHANGELOG.md index a9fbe56642af1..2db6ffe4dbc1c 100644 --- a/packages/expo-router/CHANGELOG.md +++ b/packages/expo-router/CHANGELOG.md @@ -72,10 +72,7 @@ _This version does not introduce any user-facing changes._ - Deprecate `useRootNavigation` in favor of `useNavigationContainerRef`. ([#26529](https://github.com/expo/expo/pull/26529) by [@EvanBacon](https://github.com/EvanBacon)) - Remove duplicate context mocking functions ([#26651](https://github.com/expo/expo/pull/26651) by [@marklawlor](https://github.com/marklawlor)) - <<<<<<< HEAD -- # Update to remove `ExpoRequest`/`ExpoResponse` imports from `@expo/server`. ([#27261](https://github.com/expo/expo/pull/27261) by [@kitten](https://github.com/kitten)) -- Update to remove `ExpoRequest`/`ExpoResponse`imports from`@expo/server`. ([#27261](https://github.com/expo/expo/pull/27261) by [@kitten](https://github.com/kitten)) - > > > > > > > cb56b95849 ([router]: consolidate router types) +- Update to remove `ExpoRequest`/`ExpoResponse` imports from `@expo/server`. ([#27261](https://github.com/expo/expo/pull/27261) by [@kitten](https://github.com/kitten)) ## 3.4.3 - 2024-01-18