Update contirbutor.html

theprince29 · Nov 23, 2023 · c76ade4 · c76ade4
1 parent fd3b10e
commit c76ade4
Showing 1 changed file with 0 additions and 33 deletions.
diff --git a/contirbutor.html b/contirbutor.html
@@ -54,7 +54,6 @@ <h2 class="text-primary mt-0">Know our Contributors</h2>
             </div>
         </div>
     </section>
-<<<<<<< HEAD
     <section class="page-section portfolio" style="background-color: antiquewhite;" id="portfolio">
       <div class="container marketing">
           <div class="row">
@@ -94,38 +93,6 @@ <h3 style="font-size: smaller;">youremail@gmail.com</h3>
                       <p><a class="btn btn-secondary mt-4" href="#">Connect »</a></p>
                   </div>
               </div>
-=======
-    <section class="page-section portfolio" style="background-color:antiquewhite;" id="portfolio">
-        <div class="container marketing">
-            <div class="row">
-              <div class="col-lg-4 ">
-                <svg class="bd-placeholder-img rounded-circle" width="140" height="140" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="Placeholder" preserveAspectRatio="xMidYMid slice" focusable="false">
-                    <title>Prince Pal</title>
-                    <image href="/helpdesk/assets/img/portfolio/fullsize/princepal.jpg" width="100%" height="100%" preserveAspectRatio="xMidYMid slice"></image>
-                  </svg>
-
-                <h2 class="fw-normal mt-4">Prince Pal</h2>
-                <h3 style="font-size: smaller;"> Owner & Developer</h3>
-                <h3 style="font-size: smaller;">CSE-AI 2k21</h3>
-                <h3 style="font-size: smaller;">uietai2k21@gmail.com</h3>
-                <p><a class="btn btn-secondary mt-4" href="https://www.linkedin.com/in/theprince29/">Connect »</a></p>
-              </div><!-- /.col-lg-4 -->
-              <div class="col-lg-4">
-                <svg class="bd-placeholder-img rounded-circle" width="140" height="140" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="Placeholder" preserveAspectRatio="xMidYMid slice" focusable="false"><title>Placeholder</title><rect width="100%" height="100%" fill="var(--bs-secondary-color)"></rect></svg>
-                <h2 class="fw-normal mt-4">Your Name</h2>
-                <h3 style="font-size: smaller;" class="">Content Contributor</h3>
-                <h3 style="font-size: smaller;">branch & year</h3>
-                <p><a class="btn btn-secondary mt-4" href="#">Connect »</a></p>
-              </div><!-- /.col-lg-4 -->
-              <div class="col-lg-4">
-                <svg class="bd-placeholder-img rounded-circle" width="140" height="140" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="Placeholder" preserveAspectRatio="xMidYMid slice" focusable="false"><title>Placeholder</title><rect width="100%" height="100%" fill="var(--bs-secondary-color)"></rect></svg>
-                <h2 class="fw-normal mt-4">Your Name</h2>
-                <h3 style="font-size: smaller;" class="">Backend Contributor</h3>
-                <h3 style="font-size: smaller;">branch & year</h3>
-                <p><a class="btn btn-secondary mt-4" href="#">Connect »</a></p>
-              </div><!-- /.col-lg-4 -->
-            </div><!-- /.row -->          
->>>>>>> 96fd045414884bec4efece5767c852cd74687803
           </div>
       </div>
   </section>