From 8e5a45dba752a1ed689c1150a7593ea33ad09aee Mon Sep 17 00:00:00 2001 From: KittenTM Date: Sat, 14 Mar 2026 00:11:58 +0100 Subject: [PATCH] fix merge conflicts in equipment --- equipment/index.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/equipment/index.html b/equipment/index.html index d691c07..3d1c13f 100644 --- a/equipment/index.html +++ b/equipment/index.html @@ -5,7 +5,8 @@ SplatNet - Splatoon's multiplayer service hub - + + @@ -18,7 +19,7 @@
- Loading + Loading
@@ -27,9 +28,9 @@
Check out the gear and weapons you had equipped while playing online! @@ -45,12 +46,12 @@
50 - +
S+ - +
@@ -97,7 +98,6 @@
- \ No newline at end of file