Skip to content

Commit b2e1579

Browse files
committed
remove stray conflict markers
1 parent 8dec012 commit b2e1579

File tree

2 files changed

+0
-15
lines changed

2 files changed

+0
-15
lines changed

docs/api/createSlice.mdx

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,6 @@ const counterSlice = createSlice({
394394
})
395395
```
396396

397-
<<<<<<< HEAD
398397
This cycle can be fixed by providing an explicit return type for the selector:
399398

400399
```ts no-transpile
@@ -440,10 +439,6 @@ const counterSlice = createSlice({
440439

441440
:::
442441

443-
=======
444-
445-
> > > > > > > master
446-
447442
## Return Value
448443

449444
`createSlice` will return an object that looks like:

docs/rtk-query/api/created-api/api-slice-utils.mdx

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -259,21 +259,11 @@ function selectInvalidatedBy(
259259
A function that can select query parameters to be invalidated.
260260

261261
The function accepts two arguments
262-
<<<<<<< HEAD
263-
264-
=======
265-
266-
> > > > > > > master
267262

268263
- the root state and
269264
- the cache tags to be invalidated.
270265

271266
It returns an array that contains
272-
<<<<<<< HEAD
273-
274-
=======
275-
276-
> > > > > > > master
277267

278268
- the endpoint name,
279269
- the original args and

0 commit comments

Comments
 (0)