fixed an issue I made oops

columbia-fsae · Apr 18, 2024 · fefe9f3 · fefe9f3
1 parent ce7fa7d
commit fefe9f3
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/about-us/index.html b/about-us/index.html
@@ -263,11 +263,7 @@ <h4 class="card-title">Audrey Ahn</h4>
                         </div>
                     </div>
                     <div class="col-sm-6 col-lg-4">
-<<<<<<< Updated upstream
                         <div class="card clean-card text-center"><img class="card-img-top w-100 d-block" src="/assets/img/headshots/Louise_Goldenberg.jpg">
-=======
-                        <div class="card clean-card text-center"><img class="card-img-top w-100 d-block" src="/assets/img/headshots/profile.png">
->>>>>>> Stashed changes
                             <div class="card-body info">
                                 <h4 class="card-title">Louise Goldenberg</h4>
                                 <p class="card-text">Social Chair</p>