Skip to content

Commit fcdf116

Browse files
committed
Resolved merge conflicts
1 parent a925904 commit fcdf116

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

frontend/about.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,17 +237,16 @@ title: About Us
237237
</a>
238238
<div class="flex flex-wrap justify-center gap-6">
239239
<div class="flex flex-col items-center text-center team-role team-role-leader text-team-role-leader">
240-
<img class="w-32 md:w-40 lg:w-[225px] aspect-square rounded-full object-cover mb-2" src="{{ '/assets/avatars/octocat.png' | url }}" alt="Eddie avatar" />
240+
<img class="w-20 md:w-28 lg:w-[120px] aspect-square rounded-full object-cover mb-2" src="{{ '/assets/avatars/octocat.png' | url }}" alt="Eddie avatar" />
241241
<span class="font-medium">Eddie</span>
242242
<span class="github">N/A</span>
243243
</div>
244244
<div class="flex flex-col items-center text-center team-role team-role-leader text-team-role-leader">
245-
<img class="w-32 md:w-40 lg:w-[225px] aspect-square rounded-full object-cover mb-2" src="{{ '/assets/avatars/octocat.png' | url }}" alt="Jasper avatar" />
245+
<img class="w-20 md:w-28 lg:w-[120px] aspect-square rounded-full object-cover mb-2" src="{{ '/assets/avatars/octocat.png' | url }}" alt="Jasper avatar" />
246246
<span class="font-medium">Jasper</span>
247247
<span class="github">N/A</span>
248248
</div>
249249
</div>
250-
{%- endfor %}
251250
</div>
252251
<h3 class="text-xl font-semibold mb-4">
253252
<span aria-hidden="true">🗺️</span> Global Moderators

0 commit comments

Comments
 (0)