From 69cd75c0e70eff3c20ad02f824e4686cc23e2178 Mon Sep 17 00:00:00 2001 From: KittenTM Date: Sat, 14 Mar 2026 00:13:39 +0100 Subject: [PATCH] fix merge conflicts in friendlist --- friend_list/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/friend_list/index.html b/friend_list/index.html index e777bb3..34c5c5b 100644 --- a/friend_list/index.html +++ b/friend_list/index.html @@ -32,8 +32,8 @@
Check the online status of your friends or see who you're battling with!
+
-