Updatefix

Frontend/Index.html

@@ -82,7 +82,6 @@
                         </a>
                     </li>
                 </ul>
-<<<<<<< Updated upstream
                 <a id="AdminPanel" type="button" class="nav-link RightNavButton" style="display: none;">
                     Admin Panel
                 </a>
@@ -93,11 +92,6 @@
                 <a id="UserLogout" type="button" class="nav-link RightNavButton" style="display: none;">
                     Logout
                 </a>
-=======
-                <a type="button" class="nav-link LoginButton" data-bs-toggle="modal" data-bs-target="#LoginModal">
-                    Login
-                </a>
->>>>>>> Stashed changes
             </div>
         </div>
     </nav>
@@ -134,18 +128,12 @@
                                     <h1 class="text-muted">
                                         Team Login
                                     </h1>
-<<<<<<< Updated upstream
 
                                     <input id="loginUsername" type="text" name="groupName" placeholder="Gruppe navn">
                                     <input id="loginPassword" type="password" name="password" placeholder="Password">
                                     
                                     <input id="LoginBtn" type="submit" name="login" value="Login">
                                     <input id="AdminLoginBtn" type="submit" name="aLogin" value="Login som admin">
-=======
-                                    <input type="text" name="" placeholder="Gruppe navn">
-                                    <input type="password" name="" placeholder="Password">
-                                    <input type="submit" name="" value="Login" href="#">
->>>>>>> Stashed changes
                                 </form>
                             </div>
                             <div class="tab-pane fade" id="Registrer" role="tabpanel" aria-labelledby="RegistrerTab">