Skip to content

Commit fc72829

Browse files
committed
fix conflict in lists-and-keys.md
1 parent 2d8cd85 commit fc72829

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

content/docs/lists-and-keys.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -184,14 +184,8 @@ function ListItem(props) {
184184
function NumberList(props) {
185185
const numbers = props.numbers;
186186
const listItems = numbers.map((number) =>
187-
<<<<<<< HEAD
188187
// Helyes! A kulcsot itt kell definiálni:
189-
<ListItem key={number.toString()}
190-
value={number} />
191-
=======
192-
// Correct! Key should be specified inside the array.
193188
<ListItem key={number.toString()} value={number} />
194-
>>>>>>> b4b59062e59d56da37274c6de1fa4a134d2d8f49
195189
);
196190
return (
197191
<ul>

0 commit comments

Comments
 (0)