chore: resolved a huge merge conflict

2025-11-13 08:56:03 +01:00
parent 5c8fd8510e 5d245d0011
commit eb0a1beeef
10 changed files with 412 additions and 296 deletions
--- a/knockoutwhistweb/app/views/mainmenu/creategame.scala.html
+++ b/knockoutwhistweb/app/views/mainmenu/creategame.scala.html
@@ -3,7 +3,7 @@
@main("Create Game") {
@navbar(user)
 <main class="lobby-background flex-grow-1">
-    <div class="w-50 mx-auto">
+    <div class="w-25 mx-auto">
        <div class="mt-3">
            <label for="lobbyname" class="form-label">Lobby-Name</label>
            <input type="text" class="form-control" id="lobbyname" name="lobbyname" placeholder="Lobby 1" required>