Updatefix

2021-03-26 08:49:03 +01:00
parent 7dd06804eb
commit c69708447c
3 changed files with 0 additions and 48 deletions
@@ -27,22 +27,6 @@
 </head>

 <body>
-<<<<<<< Updated upstream
-    
-    <div class="btn-group" role="group" aria-label="Basic example">
-  <button type="button" class="btn btn-primary">Left</button>
-  <button type="button" class="btn btn-primary">Middle</button>
-  <button type="button" class="btn btn-primary">Right</button>
-</div>
-    <div class="HeaderPanel">
-        <div class="HeaderLeft">
-            <a href="../Index.html">
-                <i class="fas fa-arrow-left"></i>
-            </a>
-            <h6>
-                Admin panel
-            </h6>
-=======
        <div class="HeaderPanel">
            <div class="HeaderLeft">
                <a href="../Index.html">
@@ -52,7 +36,6 @@
                    Admin panel
                </h6>
            </div>
->>>>>>> Stashed changes
        </div>

    <!--Opret game jam-->