patch up merge conflicts (this some bs ass commit ngl dont even LOOK at it)

This commit is contained in:
kittentm 2026-03-18 21:33:34 +01:00
commit 841fc4701e
No known key found for this signature in database
GPG key ID: AC43DFDBC1F44A91
5 changed files with 77 additions and 74 deletions

View file

@ -3,6 +3,7 @@
<head>
<meta charset="UTF-8" />
<link rel="stylesheet" href="../style.css" />
<title>mewo</title>
</head>
<body>

View file

@ -1,2 +1,3 @@
<!DOCTYPE html>
<script src="https://code.jquery.com/jquery-4.0.0.min.js"></script>
<script src="autoredirect.js"></script>

View file

@ -1,6 +1,5 @@
<!DOCTYPE html>
<html>
<html lang="en">
<head>
<meta charset="utf-8"/>
<meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible"/>
@ -20,7 +19,7 @@
<title>SplatNet - Splatoon's multiplayer service hub</title>
<link href="../assets/application-b4c7459fc6df950ab76bf61ce3457179f3260b0e44b1a2ea9fc252bbbc13ac22.css" media="all" rel="stylesheet"/>
<script data-turbolinks-track="true" src="../assets/application-e247a417be83a666f78bb66e010996d13c08ed54ebc5174448e80be44628c6fd.js"></script>
<link href="" rel="shortcut icon" type="image/x-icon"/>
<link href="../favicon.ico" rel="shortcut icon" type="image/x-icon"/>
</head>
<body>
<div class="ika-wrapper welcome">

View file

@ -38,6 +38,7 @@
<div class="stages-container" id="stages-container"></div>
</div>
</div>
<script src="/assets/general.js"></script>
<script src="stages.js"></script>

View file

@ -62,7 +62,8 @@
<label for="remember_box">Remember Me</label>
</div>
<input class="hb-btn hb-is-decide" id="btn_text" type="submit" value="Sign In"/>
<p><a class="hb-icon-external" href="https://discord.gg/grMSxZf" target="_blank">Forgot your password?</a><br/>
<p><a class="hb-icon-external" href="https://discord.gg/grMSxZf" target="_blank">Forgot your password?</a></p><br/>
</div>
</form>
</div>
</div>