We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 66c4797 commit 05116c6Copy full SHA for 05116c6
1 file changed
src/content/learn/rendering-lists.md
@@ -113,21 +113,13 @@ const people = [{
113
name: 'Махамад Абдус Салам',
114
profession: 'фізік',
115
}, {
116
-<<<<<<< HEAD
+ id: 3,
117
name: 'Персі Лавон Джуліан',
118
profession: 'хімік',
119
120
+ id: 4,
121
name: 'Субрахманьян Чандрасекар',
122
profession: 'астрафізік',
-=======
123
- id: 3,
124
- name: 'Percy Lavon Julian',
125
- profession: 'chemist',
126
-}, {
127
- id: 4,
128
- name: 'Subrahmanyan Chandrasekhar',
129
- profession: 'astrophysicist',
130
->>>>>>> 7bdbab144e09d4edf793ff5128080eb1dba79be4
131
}];
132
```
133
0 commit comments