Skip to content

Commit 05116c6

Browse files
authored
Update rendering-lists.md
1 parent 66c4797 commit 05116c6

1 file changed

Lines changed: 2 additions & 10 deletions

File tree

src/content/learn/rendering-lists.md

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -113,21 +113,13 @@ const people = [{
113113
name: 'Махамад Абдус Салам',
114114
profession: 'фізік',
115115
}, {
116-
<<<<<<< HEAD
116+
id: 3,
117117
name: 'Персі Лавон Джуліан',
118118
profession: 'хімік',
119119
}, {
120+
id: 4,
120121
name: 'Субрахманьян Чандрасекар',
121122
profession: 'астрафізік',
122-
=======
123-
id: 3,
124-
name: 'Percy Lavon Julian',
125-
profession: 'chemist',
126-
}, {
127-
id: 4,
128-
name: 'Subrahmanyan Chandrasekhar',
129-
profession: 'astrophysicist',
130-
>>>>>>> 7bdbab144e09d4edf793ff5128080eb1dba79be4
131123
}];
132124
```
133125

0 commit comments

Comments
 (0)