From: tenkyuu <hello@tenkyuu.dev>
Date: Mon, 4 Nov 2024 10:38:29 +0000 (+0800)
Subject: merge conflict fix
X-Git-Url: https://git.bochard.net/?a=commitdiff_plain;h=7ba5acf698bc5add184fef981ac6462fa2e06a3e;p=mysite.git

merge conflict fix
---

7ba5acf698bc5add184fef981ac6462fa2e06a3e
diff --cc assets/icons/favicon.ico
index 7a8f6c2,9e4295e..30a3548
Binary files differ
diff --cc assets/pfp/profile.jpg
index 8d9fb25,e48d038..3415a16
Binary files differ