Skip to content

Commit 3cfcbe9

Browse files
committed
fix(meetings.html): resolve merge conflict in meeting dates list
Remove merge conflict markers and ensure the meeting dates list is consistent and correctly formatted. This change is necessary to maintain a clean and readable HTML file, preventing any display issues on the webpage. feat(static): add favicon to enhance website branding Introduce a new favicon.png file to the static directory. This enhancement improves the website's branding by providing a recognizable icon in browser tabs and bookmarks, contributing to a more professional and polished user experience.
1 parent 1647638 commit 3cfcbe9

File tree

2 files changed

+1
-29
lines changed

2 files changed

+1
-29
lines changed

content/meetings.html

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@
3232
</p>
3333
<p>
3434
<ul>
35-
<<<<<<< HEAD:content/meetings.html
3635
<li>Dec 26, 2024 - <a href="#">0x00db</a></li>
37-
<li>Jan 30, 2025 - <a href="#">0x00dc</a></li>
36+
<li>Jan 30, 2025 - <a href="#">0x00dc</a></li>
3837
<li>Feb 27, 2025 - <a href="#">0x00dd</a></li>
3938
<li>Mar 27, 2025 - <a href="#">0x00de</a></li>
4039
<li>Apr 24, 2025 - <a href="#">0x00df</a></li>
@@ -46,33 +45,6 @@
4645
<li>Oct 30, 2025 - <a href="#">0x00e5</a></li>
4746
<li><font color="785C33">Nov 20, 2025 - <a href="#">0x00e6</a> (🦃) 1 week early</font></li>
4847
<li><font color="3C8D0D">Dec 18, 2025 - <a href="#">0x00e7</a> (🎄) 1 week early</font></li>
49-
||||||| 94f877c:_layouts/meetings.html
50-
<li>Jan 25, 2024 - <a href="meetings.html">0x00d0</a></li>
51-
<li>Feb 29, 2024 - <a href="meetings.html">0x00d1</a></li>
52-
<li>Mar 28, 2024 - <a href="meetings.html">0x00d2</a></li>
53-
<li>Apr 25, 2024 - <a href="meetings.html">0x00d3</a></li>
54-
<li>May 30, 2024 - <a href="meetings.html">0x00d4</a></li>
55-
<li>Jun 27, 2024 - <a href="meetings.html">0x00d5</a></li>
56-
<li>Jul 25, 2024 - <a href="meetings.html">0x00d6</a></li>
57-
<li>Aug 29, 2024 - <a href="meetings.html">0x00d7</a></li>
58-
<li>Sep 26, 2024 - <a href="meetings.html">0x00d8</a></li>
59-
<li><font color="orange">Oct 24, 2024 - <a href="meetings.html">0x00d9</a> (🎃) 1 week early</font></li>
60-
<li><font color="785C33">Nov 21, 2024 - <a href="meetings.html">0x00da</a> (🦃) 1 week early</font></li>
61-
<li>Dec 26, 2024 - <a href="meetings.html">0x00db</a></li>
62-
=======
63-
<li>Dec 26, 2024 - <a href="meetings.html">0x00db</a></li>
64-
<li>Jan 30, 2025 - <a href="meetings.html">0x00dc</a></li>
65-
<li>Feb 27, 2025 - <a href="meetings.html">0x00dd</a></li>
66-
<li>Mar 27, 2025 - <a href="meetings.html">0x00de</a></li>
67-
<li>Apr 24, 2025 - <a href="meetings.html">0x00df</a></li>
68-
<li>May 29, 2025 - <a href="meetings.html">0x00e0</a></li>
69-
<li>Jun 26, 2025 - <a href="meetings.html">0x00e1</a></li>
70-
<li>Jul 31, 2025 - <a href="meetings.html">0x00e2</a></li>
71-
<li>Aug 28, 2025 - <a href="meetings.html">0x00e3</a></li>
72-
<li>Sep 25, 2025 - <a href="meetings.html">0x00e4</a></li>
73-
<li>Oct 30, 2025 - <a href="meetings.html">0x00e5</a></li>
74-
<li><font color="785C33">Nov 20, 2025 - <a href="meetings.html">0x00e6</a> (🦃) 1 week early</font></li>
75-
<li><font color="3C8D0D">Dec 18, 2025 - <a href="meetings.html">0x00e7</a> (🎄) 1 week early</font></li>
7648
</ul>
7749
</p>
7850
<p>

static/favicon.png

9.29 KB
Loading

0 commit comments

Comments
 (0)