Resolving conflicts.

static/CSS/loginstyle.css

@@ -10,7 +10,7 @@ header{
 
 .card{
     margin: 0 auto;
-    float: none; 
+    float: none;
     margin-bottom: 10px;
 }
 
@@ -22,8 +22,3 @@ body{
     font-family: 'Sora', sans-serif;
     background-color: #212529;
     color: white;
-<<<<<<< HEAD
-}
-=======
-}
->>>>>>> 9c7255d510762a8f16afeba2657cad4a0f8b8239

static/login.html

@@ -20,29 +20,29 @@
     <title>Login</title>
     <div id="card" class="card text-dark w-25 text-center">
         <div class="card-body text-center">
-        
+
 
         <form>
             <!-- Email input -->
             <div class="form-outline mb-4">
-<<<<<<< HEAD
+
                 <input type="email" id="recordEmail" class="form-control" />
-=======
+
                 <input type="email" id="form2Example1" class="form-control" />
->>>>>>> 9c7255d510762a8f16afeba2657cad4a0f8b8239
+
                 <label class="form-label" for="form2Example1">Email address</label>
             </div>
-  
+
             <!-- Password input -->
             <div class="form-outline mb-4">
-<<<<<<< HEAD
+
                 <input type="password" id="recordPassword" class="form-control" />
-=======
+
                 <input type="password" id="form2Example2" class="form-control" />
->>>>>>> 9c7255d510762a8f16afeba2657cad4a0f8b8239
+
                 <label class="form-label" for="form2Example2">Password</label>
             </div>
-  
+
             <!-- 2 column grid layout for inline styling -->
             <div class="row mb-4">
             <div class="col d-flex justify-content-center">
@@ -52,12 +52,12 @@
                     <label class="form-check-label" for="form2Example31"> Remember me </label>
                 </div>
             </div>
-  
+
             <div class="col">
                 <!-- Simple link -->
                 <a href="#!">Forgot password?</a>
             </div>
-  
+
             <!-- Submit button -->
             <button onclick="window.location.href='landingpage.html';" type="button" class="btn btn-light">
                 <span class="spinner-grow spinner-grow-sm"></span>
@@ -68,8 +68,7 @@
             <p>Not a member? <a href="#!">Register</a></p>
         </form>
     </body>
-<<<<<<< HEAD
+
 </html>
-=======
+
 </html>
->>>>>>> 9c7255d510762a8f16afeba2657cad4a0f8b8239