Skip to content

Commit ffab51b

Browse files
merging all conflicts
2 parents 05ec437 + 341c312 commit ffab51b

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

src/content/learn/scaling-up-with-reducer-and-context.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,11 @@ ul, li { margin: 0; padding: 0; }
685685
</TasksContext>
686686
```
687687

688+
<<<<<<< HEAD
688689
Натомість будь-який компонент, якому потрібен перелік завдань, може мати його з `TaskContext`:
690+
=======
691+
Instead, any component that needs the task list can read it from the `TasksContext`:
692+
>>>>>>> 341c312916e1b657262bbe14b134a6f1779fecf1
689693
690694
```js {2}
691695
export default function TaskList() {

0 commit comments

Comments
 (0)