From f62986c744b4d06ef318eea83b56bd74bd99f931 Mon Sep 17 00:00:00 2001 From: Niklas Mollenhauer Date: Fri, 22 Nov 2024 19:46:56 +0100 Subject: [PATCH] Remove conflict markers from changelog (#12349) * Remove conflict markers from changelog * Update contributors.yml --- CHANGELOG.md | 10 +--------- contributors.yml | 1 + 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fe19c029c9..65cf38c1a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -661,9 +661,7 @@ async function fakeGetSlugsFromCms() { - [`@react-router/remix-config-routes-adapter`](https://github.com/remix-run/react-router/blob/react-router%407.0.0/packages/react-router-remix-config-routes-adapter/CHANGELOG.md#700) - [`@react-router/serve`](https://github.com/remix-run/react-router/blob/react-router%407.0.0/packages/react-router-serve/CHANGELOG.md#700) -# **Full Changelog**: [`v6.28.0...v7.0.0`](https://github.com/remix-run/react-router/compare/react-router@6.28.0...react-router@7.0.0) - -> > > > > > > release-next +**Full Changelog**: [`v6.28.0...v7.0.0`](https://github.com/remix-run/react-router/compare/react-router@6.28.0...react-router@7.0.0) ## v6.28.0 @@ -685,12 +683,6 @@ Date: 2024-11-06 **Full Changelog**: [`v6.27.0...v6.28.0`](https://github.com/remix-run/react-router/compare/react-router@6.27.0...react-router@6.28.0) -# <<<<<<< HEAD - -> > > > > > > dev - -> > > > > > > release-next - ## v6.27.0 Date: 2024-10-11 diff --git a/contributors.yml b/contributors.yml index fef537e8f2..e03935e6c5 100644 --- a/contributors.yml +++ b/contributors.yml @@ -202,6 +202,7 @@ - mtendekuyokwa19 - mtliendo - ned-park +- nikeee - nilubisan - Nismit - nnhjs