fix changelog merge

expo · Mar 14, 2024 · da8090f · da8090f
1 parent d0ffd44
commit da8090f
Showing 1 changed file with 1 addition and 4 deletions.
diff --git 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