merge conflict fix

author tenkyuu <hello@tenkyuu.dev>

Mon, 4 Nov 2024 10:38:29 +0000 (18:38 +0800)

committer tenkyuu <hello@tenkyuu.dev>

Mon, 4 Nov 2024 10:38:29 +0000 (18:38 +0800)
author tenkyuu <hello@tenkyuu.dev>
Mon, 4 Nov 2024 10:38:29 +0000 (18:38 +0800)
committer tenkyuu <hello@tenkyuu.dev>
Mon, 4 Nov 2024 10:38:29 +0000 (18:38 +0800)
diff --cc assets/icons/favicon.ico

index 7a8f6c261f968b4cf38f29fae98e0223fbc4418d,9e4295e66a9b6fccac948aac34fd9820b56c788b..30a3548bb8f6e5c4d63529b904125a6ae60902d2

Binary files differ
diff --cc assets/pfp/profile.jpg

index 8d9fb25c4b62cbd21520cf2ebe74aeacd5f2325b,e48d03856295e85bce30eb8a0c77f2b070b88ff0..3415a16b7fa6561e43a3a57bf261f7d049115655

Binary files differ
author	tenkyuu <hello@tenkyuu.dev>
	Mon, 4 Nov 2024 10:38:29 +0000 (18:38 +0800)
committer	tenkyuu <hello@tenkyuu.dev>
	Mon, 4 Nov 2024 10:38:29 +0000 (18:38 +0800)
		1	2
assets/icons/favicon.ico	patch \|	diff1 \|	diff2 \|	blob \| history
assets/pfp/profile.jpg	patch \|	diff1 \|	diff2 \|	blob \| history