remove stray conflict markers

reduxjs · Nov 14, 2023 · b2e1579 · b2e1579
1 parent 8dec012
commit b2e1579
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 15 deletions.
diff --git a/docs/api/createSlice.mdx b/docs/api/createSlice.mdx
@@ -394,7 +394,6 @@ const counterSlice = createSlice({
 })
 ```
 
-<<<<<<< HEAD
 This cycle can be fixed by providing an explicit return type for the selector:
 
 ```ts no-transpile
@@ -440,10 +439,6 @@ const counterSlice = createSlice({
 
 :::
 
-=======
-
-> > > > > > > master
-
 ## Return Value
 
 `createSlice` will return an object that looks like:

diff --git a/docs/rtk-query/api/created-api/api-slice-utils.mdx b/docs/rtk-query/api/created-api/api-slice-utils.mdx
@@ -259,21 +259,11 @@ function selectInvalidatedBy(
 A function that can select query parameters to be invalidated.
 
 The function accepts two arguments
-<<<<<<< HEAD
-
-=======
-
-> > > > > > > master
 
 - the root state and
 - the cache tags to be invalidated.
 
 It returns an array that contains
-<<<<<<< HEAD
-
-=======
-
-> > > > > > > master
 
 - the endpoint name,
 - the original args and