Skip to content

Commit 1a68121

Browse files
authored
Update keeping-components-pure.md
1 parent 65329d9 commit 1a68121

File tree

1 file changed

+3
-26
lines changed

1 file changed

+3
-26
lines changed

src/content/learn/keeping-components-pure.md

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -607,15 +607,9 @@ export default function StoryTray({ stories }) {
607607
import { useState, useEffect } from 'react';
608608
import StoryTray from './StoryTray.js';
609609

610-
<<<<<<< HEAD
611-
let initialStories = [
610+
const initialStories = [
612611
{id: 0, label: "Гісторыя Анкіта" },
613612
{id: 1, label: "Гісторыя Тэйлара" },
614-
=======
615-
const initialStories = [
616-
{id: 0, label: "Ankit's Story" },
617-
{id: 1, label: "Taylor's Story" },
618-
>>>>>>> 50d6991ca6652f4bc4c985cf0c0e593864f2cc91
619613
];
620614

621615
export default function App() {
@@ -709,15 +703,9 @@ export default function StoryTray({ stories }) {
709703
import { useState, useEffect } from 'react';
710704
import StoryTray from './StoryTray.js';
711705

712-
<<<<<<< HEAD
713-
let initialStories = [
706+
const initialStories = [
714707
{id: 0, label: "Гісторыя Анкіта" },
715708
{id: 1, label: "Гісторыя Тэйлара" },
716-
=======
717-
const initialStories = [
718-
{id: 0, label: "Ankit's Story" },
719-
{id: 1, label: "Taylor's Story" },
720-
>>>>>>> 50d6991ca6652f4bc4c985cf0c0e593864f2cc91
721709
];
722710

723711
export default function App() {
@@ -782,13 +770,8 @@ li {
782770

783771
```js src/StoryTray.js active
784772
export default function StoryTray({ stories }) {
785-
<<<<<<< HEAD
786773
// Скапіруйце масіў!
787-
let storiesToDisplay = stories.slice();
788-
=======
789-
// Copy the array!
790774
const storiesToDisplay = stories.slice();
791-
>>>>>>> 50d6991ca6652f4bc4c985cf0c0e593864f2cc91
792775

793776
// Не ўплывае на зыходны масіў:
794777
storiesToDisplay.push({
@@ -812,15 +795,9 @@ export default function StoryTray({ stories }) {
812795
import { useState, useEffect } from 'react';
813796
import StoryTray from './StoryTray.js';
814797

815-
<<<<<<< HEAD
816-
let initialStories = [
798+
const initialStories = [
817799
{id: 0, label: "Гісторыя Анкіта" },
818800
{id: 1, label: "Гісторыя Тэйлара" },
819-
=======
820-
const initialStories = [
821-
{id: 0, label: "Ankit's Story" },
822-
{id: 1, label: "Taylor's Story" },
823-
>>>>>>> 50d6991ca6652f4bc4c985cf0c0e593864f2cc91
824801
];
825802

826803
export default function App() {

0 commit comments

Comments
 (0)